commit 93f905e4cdbc53aac4d001dce6fe81548e3372da
author Andrew Lee <anwlee@google.com> Fri Aug 21 17:56:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 21 17:56:29 2015 +0000
tree 75b2d55bcf0a90f3e8df0fcdfe0d12a22b526c1b
parent dd6bd7e046fbff887d127bbf3ea3404ccfe64858
parent 9d1d797be52a41ed9a83790d231fa2e659666aa1

am 9d1d797b: Prevent NPE in VoicemailPlaybackPresenter.

* commit '9d1d797be52a41ed9a83790d231fa2e659666aa1':
  Prevent NPE in VoicemailPlaybackPresenter.

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 7270af7..9319b6e 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -417,9 +417,11 @@
             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);
+            }
         }
 
         /**