commit da1253b438363bda05206c1b77dbd9db03275254
author Jay Shrauner <shrauner@google.com> Fri Jul 03 19:36:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 03 19:36:13 2015 +0000
tree c1ee11e8a383d8de9a4b4b4332660cd55a4e408e
parent 94291c6f3d2f1bd3381be806e13165734523f117
parent 47c0c13464d2756db9c0e839d7f96114b92420c7

am 47c0c134: Fix NPE in pausePlayback

* commit '47c0c13464d2756db9c0e839d7f96114b92420c7':
  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 */);
     }