commit 83a87d2889304030cd9012b68761ae189b8d65d0
author Andrew Lee <anwlee@google.com> Thu Jun 11 19:09:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 11 19:09:26 2015 +0000
tree b7b754620fd78247b53f3fd78920912c13ff01d1
parent 3818cea5ab73613ae4e1bd88cbe066dd42e2fd99
parent 9e2592de75864212cbfb147875a6c63a6fee9fa6

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

* commit '9e2592de75864212cbfb147875a6c63a6fee9fa6':
  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;
         }