commit c7d111490f9f850be076cf66b2d1336142d89c56
author Yorke Lee <yorkelee@google.com> Mon Jun 29 23:57:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 23:57:04 2015 +0000
tree fedb8d7a9ed625adfc6bd63bf2985b5a20a03804
parent 0c54a0f1aa8e5d6638347f18c89c37a8c8798862
parent f453851d04fd38b02cd2cb7247775756be7a6a2a

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

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