diff options
author | Jay Shrauner <shrauner@google.com> | 2015-07-07 00:33:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 00:33:38 +0000 |
commit | f90148bf2b917d2e0e632023b4e962cdc6e3d893 (patch) | |
tree | 645156114eebc9d099e9919cb6d3525a4930e7d5 /src | |
parent | 7789504f467216b222706724a6789f25331fefd4 (diff) | |
parent | 52748171482d8b43d8b235ccd29ba5d3b4b64191 (diff) |
am 52748171: am 1cef204b: am 6fc28d21: am 1cf9fd38: am 4d6b0d46: Fix NPE in setSpeakerphoneOn
* commit '52748171482d8b43d8b235ccd29ba5d3b4b64191':
Fix NPE in setSpeakerphoneOn
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 22a3a45a0..f2621059b 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -679,7 +679,9 @@ public class VoicemailPlaybackPresenter } } else { enableProximitySensor(); - mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + if (mActivity != null) { + mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + } } } |