commit 5767052da993e533f8dba440330e322c21df3f8b
author The Android Automerger <android-build@google.com> Sat Aug 22 01:10:56 2015 -0700
committer The Android Automerger <android-build@google.com> Sat Aug 22 01:10:56 2015 -0700
tree acbb5ccea224bee4fccfa60ae2a6fe2c26c78ecb
parent 9d1d797be52a41ed9a83790d231fa2e659666aa1
parent 80f95536190e3233c0aec7e39a1e4f8d74eb8ff5

merge in mnc-release history after reset to mnc-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 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);
+            }
         }
 
         /**