Automated import from //branches/master/...@141186,141186

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

@@ -178,6 +178,7 @@ public class Status extends PreferenceActivity {
         }
         
         mPhone = PhoneFactory.getDefaultPhone();
+        // Note - missing in zaku build, be careful later...
         mSignalStrength = findPreference("signal_strength");			
         mUptime = findPreference("up_time");
         mAwakeTime = findPreference("awake_time");
@@ -241,9 +242,11 @@ public class Status extends PreferenceActivity {
             if (TextUtils.isEmpty(text)) {
                text = sUnknown;
              }
-        
+             // some preferences may be missing
+             if (findPreference(preference) != null) {
                  findPreference(preference).setSummary(text);
              }
+    }
     
     private void updateNetworkType() {
         // Whether EDGE, UMTS, etc...
@@ -300,6 +303,8 @@ public class Status extends PreferenceActivity {
     }
     
     void updateSignalStrength() {
+        // not loaded in some versions of the code (e.g., zaku)
+        if (mSignalStrength != null) {
             int state =
                     mPhoneStateReceiver.getServiceState().getState();
             Resources r = getResources();
@@ -322,6 +327,7 @@ public class Status extends PreferenceActivity {
                         + String.valueOf(signalAsu) + " "
                         + r.getString(R.string.radioInfo_display_asu));
         }
+    }
     
     private void setWifiStatus() {
         WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);