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