commit a2de7f75ac137a54787670501ec130bdcfa2f2a9
author Jay Shrauner <shrauner@google.com> Mon Jul 06 12:48:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 06 12:48:44 2015 +0000
tree f51ca00159714cfae6d4f6620076ea200e703288
parent b54c48766886d01df36165c5f428356e5a77265b
parent e78edc6423fdc46dc85d79d5416505ba55be02f1

am e78edc64: am da1253b4: am 47c0c134: Fix NPE in pausePlayback

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