Make FDN setting optional in CallFeaturesSetting
jsh [Fri, 12 Jun 2009 22:47:45 +0000 (15:47 -0700)]
Manual merge of CL 149114.

src/com/android/phone/CallFeaturesSetting.java

index 32ca69e..2a87767 100644 (file)
@@ -1461,9 +1461,11 @@ public class CallFeaturesSetting extends PreferenceActivity
         mContactListIntent = new Intent(Intent.ACTION_GET_CONTENT);
         mContactListIntent.setType(android.provider.Contacts.Phones.CONTENT_ITEM_TYPE);
 
-        mFDNSettingIntent = new Intent(Intent.ACTION_MAIN);
-        mFDNSettingIntent.setClassName(this, FdnSetting.class.getName());
-        mSubMenuFDNSettings.setIntent (mFDNSettingIntent);
+        if (mSubMenuFDNSettings != null) {
+            mFDNSettingIntent = new Intent(Intent.ACTION_MAIN);
+            mFDNSettingIntent.setClassName(this, FdnSetting.class.getName());
+            mSubMenuFDNSettings.setIntent (mFDNSettingIntent);
+        }
 
         mAppState = AppState.INPUT_READY;