commit be2fb265fd8c6534796d766600b7b73b49c09d14
author Jay Shrauner <shrauner@google.com> Tue Nov 11 15:19:58 2014 -0800
committer Jay Shrauner <shrauner@google.com> Tue Nov 11 15:22:34 2014 -0800
tree 19f2da9080961f5d2ffde813343f9c227066d6d9
parent ad5b1c0315696299db76ea8942b6458b7dcc93c3

Fix NPE in onCreate

Use TextUtils.equals for null-safe string comparison

Bug:18337966
Change-Id: I19b39c43636e04fcefabccdfff097bb3383f088f

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 4651677..2755bd7 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -1129,7 +1129,7 @@
         // Show the voicemail preference in onResume if the calling intent specifies the
         // ACTION_ADD_VOICEMAIL action.
         mShowVoicemailPreference = (icicle == null) &&
-                getIntent().getAction().equals(ACTION_ADD_VOICEMAIL);
+                TextUtils.equals(getIntent().getAction(), ACTION_ADD_VOICEMAIL);
 
         mSubscriptionInfoHelper = new SubscriptionInfoHelper(getIntent());
         mSubscriptionInfoHelper.setActionBarTitle(