Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a87cca4 authored by David Brown's avatar David Brown Committed by Android (Google) Code Review
Browse files

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

parents dcf09e84 f42d5e7e
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -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);