From 97c15d1b0b62764b84a911669b11a52c5bff989d Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Tue, 14 Jul 2015 14:23:56 -0700
Subject: Pause playback when voicemail is deleted.

We don't want the voicemail to continue playing after deleted, so
perform the pause behavior when the delete button is pressed.

Bug: 22462516
Change-Id: I664c5aed0c2bd1910cdf1f20a33c0117dde8d0cc
---
 src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to '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 f76af59a4..90617df79 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -627,7 +627,8 @@ public class VoicemailPlaybackPresenter
             mMediaPlayer.pause();
         }
 
-        mPosition = mMediaPlayer.getCurrentPosition();
+        mPosition = mMediaPlayer == null ? 0 : mMediaPlayer.getCurrentPosition();
+
         Log.d(TAG, "Paused playback at " + mPosition + ".");
 
         if (mView != null) {
@@ -646,7 +647,9 @@ public class VoicemailPlaybackPresenter
      * playing to know whether to resume playback once the user selects a new position.
      */
     public void pausePlaybackForSeeking() {
-        mShouldResumePlaybackAfterSeeking = mMediaPlayer.isPlaying();
+        if (mMediaPlayer != null) {
+            mShouldResumePlaybackAfterSeeking = mMediaPlayer.isPlaying();
+        }
         pausePlayback();
     }
 
-- 
cgit v1.2.3