commit 247143525cf045236b1ef948f0938d5820d105ef
author Makoto Onuki <omakoto@google.com> Wed Aug 05 16:55:35 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 05 16:55:35 2015 +0000
tree 90922affd1f19c78dc7963e81507704825a982f9
parent 063812c0180485c5c4bf0ad4e5cf2733c40b73b8
parent e4072d10b761c7e167c4f9b5d7570c6417c1d054

Merge "READ_SMS allows getLine1Number() [2/3]" into mnc-dev

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) {