commit 39b92c085c1a405ca09197dc6fe453c4d1d19330
author Yorke Lee <yorkelee@google.com> Tue Aug 04 22:12:17 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 04 22:12:17 2015 +0000
tree 31c21d09688d502c03f7b96c533fcfa9340e7f87
parent 5be41a7431ada6263fd66d89aeb36d43082df0f4
parent b63bb49171c6c3574448b235b93711ab285190e0

am b63bb491: am d8ef4cd1: am c1a6980e: am c246f611: am 063812c0: Bail if VoicemailProviderSettings is null

* commit 'b63bb49171c6c3574448b235b93711ab285190e0':
  Bail if VoicemailProviderSettings is null

src/com/android/phone/settings/VoicemailSettingsActivity.java

diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index bb8c6fe..a08fe30 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -929,6 +929,7 @@
             if (prevSettings == null) {
                 Log.e(LOG_TAG, "VoicemailProviderSettings for the key \""
                         + mPreviousVMProviderKey + "\" is null but should be loaded.");
+                return;
             }
 
             if (mVMChangeCompletedSuccessfully) {