commit 7d3f9ec02c696f761589c61101c07a175bca8321
author Andrew Lee <anwlee@google.com> Fri Jun 12 18:30:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 12 18:30:43 2015 +0000
tree 68875fed0261ac600373e9bafcec07235760f6e9
parent 42d8f97b49dd90c11077a680d40088d2505e1129
parent 00a68273768a9c7caa745af26d5861cc75ae0118

Merge "Paranoid mIsPrepared checks." into mnc-dev

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 94c61a6..5b4478f 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -186,8 +186,6 @@
         mView = view;
         mView.setPresenter(this);
 
-        mView.onSpeakerphoneOn(isSpeakerphoneOn());
-
         if (mVoicemailUri != null && mVoicemailUri.equals(voicemailUri)) {
             // Handles rotation case where playback view is set for the same voicemail.
             if (mIsPrepared) {
@@ -195,11 +193,17 @@
             } else {
                 checkForContent();
             }
+            mView.onSpeakerphoneOn(isSpeakerphoneOn());
         } else {
             mVoicemailUri = voicemailUri;
             mPosition = 0;
             mIsPlaying = startPlayingImmediately;
+
+            // Default to earpiece.
+            mView.onSpeakerphoneOn(false);
+
             checkForContent();
+
         }
     }