diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-11 19:09:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 19:09:26 +0000 |
| commit | 83a87d2889304030cd9012b68761ae189b8d65d0 (patch) | |
| tree | b7b754620fd78247b53f3fd78920912c13ff01d1 /src | |
| parent | 3818cea5ab73613ae4e1bd88cbe066dd42e2fd99 (diff) | |
| parent | 9e2592de75864212cbfb147875a6c63a6fee9fa6 (diff) | |
am 9e2592de: am fd5a9015: am 44919b04: Merge "Check mIsPrepared before querying MediaPlayer." into mnc-dev
* commit '9e2592de75864212cbfb147875a6c63a6fee9fa6':
Check mIsPrepared before querying MediaPlayer.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java index da2a29cf7..a0e48546f 100644 --- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java +++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java @@ -523,7 +523,8 @@ public class VoicemailPlaybackPresenter } private void enableProximitySensor() { - if (mProximityWakeLock == null || isSpeakerphoneOn() || !mMediaPlayer.isPlaying()) { + if (mProximityWakeLock == null || isSpeakerphoneOn() || + !mIsPrepared || !mMediaPlayer.isPlaying()) { return; } |