commit 03fb34b122bc917861d58e97ecb349f57693dd18
author Andrew Lee <anwlee@google.com> Thu Jun 11 22:22:17 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 11 22:22:17 2015 +0000
tree 4034d9bc3c441aa4c65d99fa7fe30b3d07f50284
parent 83a87d2889304030cd9012b68761ae189b8d65d0
parent e613827c3ca593b47177daac571faf446e9c2b3d

am e613827c: am 6cc358de: am 42d8f97b: Merge "Default to earpiece for all voicemail." into mnc-dev

* commit 'e613827c3ca593b47177daac571faf446e9c2b3d':
  Default to earpiece for all voicemail.

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 a0e4854..4ccbe10 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -184,8 +184,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) {
@@ -193,11 +191,17 @@
             } else {
                 checkForContent();
             }
+            mView.onSpeakerphoneOn(isSpeakerphoneOn());
         } else {
             mVoicemailUri = voicemailUri;
             mPosition = 0;
             mIsPlaying = startPlayingImmediately;
+
+            // Default to earpiece.
+            mView.onSpeakerphoneOn(false);
+
             checkForContent();
+
         }
     }