commit 975d2d46ac7148a86065ebf5987bc9aa2365d251
author Andrew Lee <anwlee@google.com> Tue Oct 13 00:57:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 13 00:57:01 2015 +0000
tree 3f774bfebef6ee255ed3460fb19c92a55755cee1
parent 8aa09c8771ef5d521c3f646484d9304a19cf6fd9
parent 257368c2dff97da3b9be7653190699b5686e1b56

Merge "Implement behavior for import settings visibility." into ub-contactsdialer-a-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 8b8b7c5..9b4e20d 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -625,7 +625,7 @@
      * playing.
      */
     public void resumePlayback() {
-        if (mView == null) {
+        if (mView == null || mContext == null) {
             return;
         }
 
@@ -638,7 +638,7 @@
 
         mIsPlaying = true;
 
-        if (!mMediaPlayer.isPlaying()) {
+        if (mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
             // Clamp the start position between 0 and the duration.
             mPosition = Math.max(0, Math.min(mPosition, mDuration.get()));