PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ed47f1e4: Fix the NullPointerException in Status Info.

Browse Source 
Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
  Fix the NullPointerException in Status Info.
This commit is contained in:
John Wang
2009-07-30 18:58:55 -07:00
committed by Android Git Automerger
parent d20e072357 ed47f1e497
commit 4c47009172
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/deviceinfo/Status.java
View File

@@ -162,6 +162,7 @@ public class Status extends PreferenceActivity {
@Override @Override
protected void onCreate(Bundle icicle) { protected void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
Preference removablePref;
mHandler = new MyHandler(this); mHandler = new MyHandler(this);
@@ -188,8 +189,15 @@ public class Status extends PreferenceActivity {
setSummaryText("prl_version", mPhone.getCdmaPrlVersion()); setSummaryText("prl_version", mPhone.getCdmaPrlVersion());
// device is not GSM/UMTS, do not display GSM/UMTS features // device is not GSM/UMTS, do not display GSM/UMTS features
getPreferenceScreen().removePreference(findPreference("imei")); // check Null in case no specified preference in overlay xml
getPreferenceScreen().removePreference(findPreference("imei_sv")); removablePref = findPreference("imei");
if (removablePref != null) {
getPreferenceScreen().removePreference(removablePref);
}
removablePref = findPreference("imei_sv");
if (removablePref != null) {
getPreferenceScreen().removePreference(removablePref);
}
} else { } else {
setSummaryText("imei", mPhone.getDeviceId()); setSummaryText("imei", mPhone.getDeviceId());
@@ -198,9 +206,19 @@ public class Status extends PreferenceActivity {
.getDeviceSoftwareVersion()); .getDeviceSoftwareVersion());
// device is not CDMA, do not display CDMA features // device is not CDMA, do not display CDMA features
getPreferenceScreen().removePreference(findPreference("prl_version")); // check Null in case no specified preference in overlay xml
getPreferenceScreen().removePreference(findPreference("meid_number")); removablePref = findPreference("prl_version");
getPreferenceScreen().removePreference(findPreference("min_number")); 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()); setSummaryText("number", mPhone.getLine1Number());