commit 063812c0180485c5c4bf0ad4e5cf2733c40b73b8
author Yorke Lee <yorkelee@google.com> Tue Aug 04 14:10:29 2015 -0700
committer Yorke Lee <yorkelee@google.com> Tue Aug 04 14:10:29 2015 -0700
tree c88c175374c58e0e7f083d8901268fe496edefbb
parent 83ea23b90597f39f5f8f899023ae099eab0e98e2

Bail if VoicemailProviderSettings is null

Bug: 22930083
Change-Id: I7af6d2dc3e6962e8847fae7690a9b14db375647b

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