commit 9e2592de75864212cbfb147875a6c63a6fee9fa6
author Andrew Lee <anwlee@google.com> Thu Jun 11 18:57:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 11 18:57:23 2015 +0000
tree da3c0cf1d9b4f1f61971fabccf7c55ccc2989b6a
parent 48a91d7a13cdb76f7263cd673ced557e65fccd3e
parent fd5a9015641a5fd2eea24e11e6c309cba2ba97a8

am fd5a9015: am 44919b04: Merge "Check mIsPrepared before querying MediaPlayer." into mnc-dev

* commit 'fd5a9015641a5fd2eea24e11e6c309cba2ba97a8':
  Check mIsPrepared before querying MediaPlayer.

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 da2a29c..a0e4854 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -523,7 +523,8 @@
     }
 
     private void enableProximitySensor() {
-        if (mProximityWakeLock == null || isSpeakerphoneOn() || !mMediaPlayer.isPlaying()) {
+        if (mProximityWakeLock == null || isSpeakerphoneOn() ||
+                !mIsPrepared || !mMediaPlayer.isPlaying()) {
             return;
         }