commit c246f6116fb169795abc8238c5074743d1dde019
author Yorke Lee <yorkelee@google.com> Tue Aug 04 21:36:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 04 21:36:15 2015 +0000
tree 3b1eb7c5da4ba592f4619e6884be516acf7496eb
parent 7d3471a34715b043d99f19782547dcdf1d411c01
parent 063812c0180485c5c4bf0ad4e5cf2733c40b73b8

am 063812c0: Bail if VoicemailProviderSettings is null

* commit '063812c0180485c5c4bf0ad4e5cf2733c40b73b8':
  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) {