commit 4c470091723e84dc894154a030f02b5153d286e5
author John Wang <johnwang@google.com> Thu Jul 30 18:58:55 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 30 18:58:55 2009 -0700
tree 8b72b95808fc42827207ca2340a8b00418ab5740
parent d20e072357453876041aae94be7bfb48cd545d83
parent ed47f1e497abf5ad31b1c7035ae04478e9932986

am ed47f1e4: Fix the NullPointerException in Status Info.

Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
  Fix the NullPointerException in Status Info.

src/com/android/settings/deviceinfo/Status.java

diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 4b1cbbf..1341989 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -162,6 +162,7 @@
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        Preference removablePref;
 
         mHandler = new MyHandler(this);
         
@@ -188,8 +189,15 @@
             setSummaryText("prl_version", mPhone.getCdmaPrlVersion());
 
             // device is not GSM/UMTS, do not display GSM/UMTS features
-            getPreferenceScreen().removePreference(findPreference("imei"));
-            getPreferenceScreen().removePreference(findPreference("imei_sv"));
+            // check Null in case no specified preference in overlay xml
+            removablePref = findPreference("imei");
+            if (removablePref != null) {
+                getPreferenceScreen().removePreference(removablePref);
+            }
+            removablePref = findPreference("imei_sv");
+            if (removablePref != null) {
+                getPreferenceScreen().removePreference(removablePref);
+            }
         } else {
             setSummaryText("imei", mPhone.getDeviceId());
 
@@ -198,9 +206,19 @@
                         .getDeviceSoftwareVersion());
 
             // device is not CDMA, do not display CDMA features
-            getPreferenceScreen().removePreference(findPreference("prl_version"));
-            getPreferenceScreen().removePreference(findPreference("meid_number"));
-            getPreferenceScreen().removePreference(findPreference("min_number"));
+            // check Null in case no specified preference in overlay xml
+            removablePref = findPreference("prl_version");
+            if (removablePref != null) {
+                getPreferenceScreen().removePreference(removablePref);
+            }
+            removablePref = findPreference("meid_number");
+            if (removablePref != null) {
+                getPreferenceScreen().removePreference(removablePref);
+            }
+            removablePref = findPreference("min_number");
+            if (removablePref != null) {
+                getPreferenceScreen().removePreference(removablePref);
+            }
         }
 
         setSummaryText("number", mPhone.getLine1Number());