diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-07-06 22:42:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-06 22:42:35 +0000 |
| commit | aea8f0eb29c38e323b7925141bf98cfb1338f1ca (patch) | |
| tree | e641e4822798f2c9fa4f89d6028141cfc1974c96 | |
| parent | 05e3bbc22efc66e52c06885842ed0c8478e5e517 (diff) | |
| parent | 4d6b0d46545b98b5e22d8d0da2b7adf2137724be (diff) | |
am 4d6b0d46: Fix NPE in setSpeakerphoneOn
* commit '4d6b0d46545b98b5e22d8d0da2b7adf2137724be':
Fix NPE in setSpeakerphoneOn
| -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); + } } } |