diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-29 23:44:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 23:44:59 +0000 |
| commit | f453851d04fd38b02cd2cb7247775756be7a6a2a (patch) | |
| tree | 6dfefebc7e1f85dbac156b0781a8258b03410ef6 | |
| parent | cd79ac4da79817e602362acace4898075d075bda (diff) | |
| parent | 9cdd722c31dbaa9ee0e31210d2135a71a7f38bce (diff) | |
am 9cdd722c: am 1bb1fa97: Merge "Add missing null check in VoicemailPlaybackPresenter" into mnc-dev
* commit '9cdd722c31dbaa9ee0e31210d2135a71a7f38bce':
Add missing null check in VoicemailPlaybackPresenter
| -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 */); } |