1 files changed, 22 insertions, 4 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index 7270af787..19e190c32 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -94,6 +94,8 @@ public class VoicemailPlaybackPresenter
 
     public interface OnVoicemailDeletedListener {
         void onVoicemailDeleted(Uri uri);
+        void onVoicemailDeleteUndo();
+        void onVoicemailDeletedInDatabase();
     }
 
     /** The enumeration of {@link AsyncTask} objects we use in this class. */
@@ -417,9 +419,11 @@ public class VoicemailPlaybackPresenter
             super(handler);
             mFetchResultHandler = handler;
 
-            mContext.getContentResolver().registerContentObserver(
-                    voicemailUri, false, this);
-            mFetchResultHandler.postDelayed(this, FETCH_CONTENT_TIMEOUT_MS);
+            if (mContext != null) {
+                mContext.getContentResolver().registerContentObserver(
+                        voicemailUri, false, this);
+                mFetchResultHandler.postDelayed(this, FETCH_CONTENT_TIMEOUT_MS);
+            }
         }
 
         /**
@@ -730,12 +734,26 @@ public class VoicemailPlaybackPresenter
     }
 
     /* package */ void onVoicemailDeleted() {
-        // Trampoline the event notification to the interested listener
+        // Trampoline the event notification to the interested listener.
         if (mOnVoicemailDeletedListener != null) {
             mOnVoicemailDeletedListener.onVoicemailDeleted(mVoicemailUri);
         }
     }
 
+    /* package */ void onVoicemailDeleteUndo() {
+        // Trampoline the event notification to the interested listener.
+        if (mOnVoicemailDeletedListener != null) {
+            mOnVoicemailDeletedListener.onVoicemailDeleteUndo();
+        }
+    }
+
+    /* package */ void onVoicemailDeletedInDatabase() {
+        // Trampoline the event notification to the interested listener.
+        if (mOnVoicemailDeletedListener != null) {
+            mOnVoicemailDeletedListener.onVoicemailDeletedInDatabase();
+        }
+    }
+
     private static synchronized ScheduledExecutorService getScheduledExecutorServiceInstance() {
         if (mScheduledExecutorService == null) {
             mScheduledExecutorService = Executors.newScheduledThreadPool(NUMBER_OF_THREADS_IN_POOL);