diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-29 23:21:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 23:21:14 +0000 |
| commit | 1bb1fa97c52887d65a8c5d1d7cd523d545b903f8 (patch) | |
| tree | 1f8f0e0f888116102596510646cfac074f4d2bc7 /src | |
| parent | fcb105e4fd322e796ea78c4981df36e1f18f9221 (diff) | |
| parent | acffcb1d4a1dde739af1de0a75b071825aeab0c1 (diff) | |
Merge "Add missing null check in VoicemailPlaybackPresenter" into mnc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java index 92bc08977..4597d35d0 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -286,7 +286,9 @@ public class VoicemailPlaybackPresenter mMediaPlayer = null; } - mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + if (mActivity != null) { + mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + } disableProximitySensor(false /* waitForFarState */); } |