diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-07-06 12:48:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-06 12:48:44 +0000 |
| commit | a2de7f75ac137a54787670501ec130bdcfa2f2a9 (patch) | |
| tree | f51ca00159714cfae6d4f6620076ea200e703288 | |
| parent | b54c48766886d01df36165c5f428356e5a77265b (diff) | |
| parent | e78edc6423fdc46dc85d79d5416505ba55be02f1 (diff) | |
am e78edc64: am da1253b4: am 47c0c134: Fix NPE in pausePlayback
* commit 'e78edc6423fdc46dc85d79d5416505ba55be02f1':
Fix NPE in pausePlayback
| -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 19f71455d..22a3a45a0 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -619,7 +619,9 @@ public class VoicemailPlaybackPresenter } mAudioManager.abandonAudioFocus(this); - mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + if (mActivity != null) { + mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + } disableProximitySensor(true /* waitForFarState */); } |