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

Merge "Fix 2520977: NPE in com.android.settings.deviceinfo.Status"

Browse Source
This commit is contained in:
David Brown
2010-03-18 12:45:25 -07:00
committed by Android (Google) Code Review
parent dcf09e84ad f42d5e7e2e
commit 7a87cca46b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,7 +222,13 @@ public class Status extends PreferenceActivity {
} }
} }
setSummaryText("number", PhoneNumberUtils.formatNumber(mPhone.getLine1Number())); String rawNumber = mPhone.getLine1Number(); // may be null or empty
String formattedNumber = null;
if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
}
// If formattedNumber is null or empty, it'll display as "Unknown".
setSummaryText("number", formattedNumber);
mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler); mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED); mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);