commit 6fc28d217004dfd80e0c9c4cef22e863d1e02a26
author Jay Shrauner <shrauner@google.com> Mon Jul 06 23:01:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 06 23:01:31 2015 +0000
tree c1d826bb3c3fccfc6f5384266f59cbb2c7d3ad0a
parent 1e0ecf870fbadd98ed0ec5cb9192f41a663d38cc
parent 1cf9fd38cc888cb6a851e3becb206a7f38e223e2

am 1cf9fd38: am 4d6b0d46: Fix NPE in setSpeakerphoneOn

* commit '1cf9fd38cc888cb6a851e3becb206a7f38e223e2':
  Fix NPE in setSpeakerphoneOn

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);
+            }
         }
     }