| commit | 44919b041bd28792e18cfa65ea6868da3d8b9f52 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Thu Jun 11 18:24:28 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 11 18:24:29 2015 +0000 |
| tree | 8690e15628e947f8cbff6259fde9a3e222f1803b | |
| parent | d78fd115d8e0abddc0885ea33ff9f07790009d0c [diff] | |
| parent | 200916e230f4876d55dc5cfb158565b901073730 [diff] |
Merge "Check mIsPrepared before querying MediaPlayer." into mnc-dev
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; }