From 4d6b0d46545b98b5e22d8d0da2b7adf2137724be Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Mon, 6 Jul 2015 15:07:54 -0700 Subject: Fix NPE in setSpeakerphoneOn Null check mActivity Bug:22301343 Change-Id: Ia020f2a8c74cf16786af9ab7132da4eb9b9d0401 --- src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/com/android/dialer/voicemail') diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java index 22a3a45a0..f2621059b 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -679,7 +679,9 @@ public class VoicemailPlaybackPresenter } } else { enableProximitySensor(); - mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + if (mActivity != null) { + mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); + } } } -- cgit v1.2.3