commit b63bb49171c6c3574448b235b93711ab285190e0
author Yorke Lee <yorkelee@google.com> Tue Aug 04 22:04:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 04 22:04:03 2015 +0000
tree 2280a38bc08ef82a71c0da3d1cdf9466f19ee979
parent 4462e18cfde491c54a8affa2898152b2ff5321d4
parent d8ef4cd1adbbe7d788bef8ef6c65102e015e39c6

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

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