commit 1bb1fa97c52887d65a8c5d1d7cd523d545b903f8
author Yorke Lee <yorkelee@google.com> Mon Jun 29 23:21:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 29 23:21:14 2015 +0000
tree 1f8f0e0f888116102596510646cfac074f4d2bc7
parent fcb105e4fd322e796ea78c4981df36e1f18f9221
parent acffcb1d4a1dde739af1de0a75b071825aeab0c1

Merge "Add missing null check in VoicemailPlaybackPresenter" into mnc-dev

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 */);
     }