commit e78edc6423fdc46dc85d79d5416505ba55be02f1
author Jay Shrauner <shrauner@google.com> Fri Jul 03 19:49:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 03 19:49:54 2015 +0000
tree c1ee11e8a383d8de9a4b4b4332660cd55a4e408e
parent ace779434cb82410aa44469be37119296c124b9e
parent da1253b438363bda05206c1b77dbd9db03275254

am da1253b4: am 47c0c134: Fix NPE in pausePlayback

* commit 'da1253b438363bda05206c1b77dbd9db03275254':
  Fix NPE in pausePlayback

src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java

diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index 19f7145..22a3a45 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -619,7 +619,9 @@
         }
         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 */);
     }