commit 17c2f110847c21bcc923f7b3312b06203aa79798
author The Android Automerger <android-build@google.com> Mon Feb 09 06:10:32 2015 -0800
committer The Android Automerger <android-build@google.com> Mon Feb 09 06:10:32 2015 -0800
tree 3894aa52c534a5de4d5a19a0b3989455e37425b4
parent 06d7d08ecac60bca1472b5e380db7ce6fad0ea43
parent 76ecedfe6d77f40063a6a8f24039d88bf0956c3c

merge in lmp-mr1-release history after reset to lmp-mr1-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 085ef66..cb246f4 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -446,12 +446,10 @@
         @Override
         public Exception doInBackground(Void... params) {
             try {
-                if (!mPlayer.isReadyToPlay()) {
-                    mPlayer.reset();
-                    mPlayer.setDataSource(mView.getDataSourceContext(), mVoicemailUri);
-                    mPlayer.setAudioStreamType(PLAYBACK_STREAM);
-                    mPlayer.prepare();
-                }
+                mPlayer.reset();
+                mPlayer.setDataSource(mView.getDataSourceContext(), mVoicemailUri);
+                mPlayer.setAudioStreamType(PLAYBACK_STREAM);
+                mPlayer.prepare();
                 return null;
             } catch (Exception e) {
                 return e;