commit 97d39423510cfc31aea27a631aacc5ba34db28aa
author Nancy Chen <nancychen@google.com> Tue Jul 07 19:41:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 07 19:41:01 2015 +0000
tree fb8e798c5c584affa6e9d9eb245ddfcf4f3ffa5a
parent 4d6b0d46545b98b5e22d8d0da2b7adf2137724be
parent 019713e2b85ff6868c7a77f556b03702d5d07cb0

Merge "Go to recents tab instead of CallLogActivity for call views." 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 22a3a45..f262105 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -679,7 +679,9 @@
             }
         } else {
             enableProximitySensor();
-            mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
+            if (mActivity != null) {
+                mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
+            }
         }
     }