commit fc85caa3001c0d7ab172bca47df49be70167f16b
author Wink Saville <wink@google.com> Tue Jul 21 17:58:38 2009 -0700
committer Wink Saville <wink@google.com> Tue Jul 21 17:58:38 2009 -0700
tree 3f16bbc23207d5b64dbbc4961f5646c1c5d3157c
parent b1164d370e8d83a8a4f3cbdc73dffc087254cabd

Fix bug 1964508 caused by mSubMenuFDNSettings being null on docomo.

src/com/android/phone/CallFeaturesSetting.java

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) {