Fix bug 1964508 caused by mSubMenuFDNSettings being null on docomo.
Wink Saville [Wed, 22 Jul 2009 00:58:38 +0000 (17:58 -0700)]
src/com/android/phone/CallFeaturesSetting.java

index 25a358a..4806b0b 100755 (executable)
@@ -1467,9 +1467,12 @@ public class CallFeaturesSetting extends PreferenceActivity
             if (mButtonCLIR != null ) {
                 mButtonCLIR.setOnPreferenceChangeListener(this);
             }
-            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);
+            }
         }
 
         if (mSubMenuVoicemailSettings != null) {