Fix bug 1964508 caused by mSubMenuFDNSettings being null on docomo.
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 25a358a..4806b0b 100755
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -1467,9 +1467,12 @@
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) {