From 47c0c13464d2756db9c0e839d7f96114b92420c7 Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Fri, 3 Jul 2015 12:02:23 -0700 Subject: Fix NPE in pausePlayback Null check mActivity as we do in onPause Bug:22249553 Change-Id: I147fbd517696205a2eb478a6df032f50cbbd5b34 --- src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/com/android/dialer/voicemail') 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 */); } -- cgit v1.2.3