diff options
| author | David Brown <dab@google.com> | 2010-03-18 12:45:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-18 12:45:25 -0700 |
| commit | 7a87cca46b0bb5e7a9ff89a2908965d78e30de3b (patch) | |
| tree | 3f690cc845227a8f8f04e3a9c7e8e8e3216920f8 /src | |
| parent | dcf09e84ad4f4c18d1caed5d610a98de59f90b86 (diff) | |
| parent | f42d5e7e2ee7dde31e64270246c2e3b8d573d61b (diff) | |
| download | packages_apps_Settings-7a87cca46b0bb5e7a9ff89a2908965d78e30de3b.zip packages_apps_Settings-7a87cca46b0bb5e7a9ff89a2908965d78e30de3b.tar.gz packages_apps_Settings-7a87cca46b0bb5e7a9ff89a2908965d78e30de3b.tar.bz2 | |
Merge "Fix 2520977: NPE in com.android.settings.deviceinfo.Status"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/deviceinfo/Status.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index ea3ca97..99a8975 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -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.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED); |