Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc am: ab2a2b3d3f

am: daed3366ef

Change-Id: I60829ec1fd45ea1e265d4fdad346ca296d7a9b5d

src/com/android/settings/network/telephony/WifiCallingPreferenceController.java

@@ -114,6 +114,10 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
         if (mSimCallManager != null) {
             Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
                     mSimCallManager);
+            if (intent == null) {
+                // Do nothing in this case since preference is invisible
+                return;
+            }
             final PackageManager pm = mContext.getPackageManager();
             List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
             preference.setTitle(resolutions.get(0).loadLabel(pm));