diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-07-06 23:37:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-06 23:37:25 +0000 |
| commit | 52748171482d8b43d8b235ccd29ba5d3b4b64191 (patch) | |
| tree | e641e4822798f2c9fa4f89d6028141cfc1974c96 /src | |
| parent | 49871b5073cde1d8775ff876a65b38c8ccd9b145 (diff) | |
| parent | 1cef204b55a393e79a1aeff6443cdddcea015082 (diff) | |
am 1cef204b: am 6fc28d21: am 1cf9fd38: am 4d6b0d46: Fix NPE in setSpeakerphoneOn
* commit '1cef204b55a393e79a1aeff6443cdddcea015082':
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); + } } } |