commit f453851d04fd38b02cd2cb7247775756be7a6a2a
author Yorke Lee <yorkelee@google.com> Mon Jun 29 23:44:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 23:44:59 2015 +0000
tree 6dfefebc7e1f85dbac156b0781a8258b03410ef6
parent cd79ac4da79817e602362acace4898075d075bda
parent 9cdd722c31dbaa9ee0e31210d2135a71a7f38bce

am 9cdd722c: am 1bb1fa97: Merge "Add missing null check in VoicemailPlaybackPresenter" into mnc-dev

* commit '9cdd722c31dbaa9ee0e31210d2135a71a7f38bce':
  Add missing null check in VoicemailPlaybackPresenter

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 92bc089..4597d35 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -286,7 +286,9 @@
             mMediaPlayer = null;
         }
 
-        mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
+        if (mActivity != null) {
+            mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
+        }
         disableProximitySensor(false /* waitForFarState */);
     }