From 9f984b5d031ca03a9a3991e60cf1033e1e2cdf2c Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Tue, 31 Mar 2020 16:28:18 -0700 Subject: [PATCH] Hide unprovisioned MDN (phone number) at select profile dialog Bug: 151773922 Test: Build & Device Change-Id: If84600cc426fefcdd219c4a44a5510b8db5c0a89 Merged-In: If84600cc426fefcdd219c4a44a5510b8db5c0a89 --- src/com/android/settings/sim/SimListDialogFragment.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java index bb16fd47e33..d1fb3740e76 100644 --- a/src/com/android/settings/sim/SimListDialogFragment.java +++ b/src/com/android/settings/sim/SimListDialogFragment.java @@ -23,6 +23,7 @@ import android.content.DialogInterface; import android.os.Bundle; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -179,11 +180,16 @@ public class SimListDialogFragment extends SimDialogFragment implements Utils.getColorAttr(mContext, android.R.attr.textColorSecondary)); } else { title.setText(sub.getDisplayName()); - summary.setText(sub.getNumber()); + summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : ""); icon.setImageBitmap(sub.createIconBitmap(mContext)); } return convertView; } + + // An MDN is considered not provisioned if it's empty or all 0's + private boolean isMdnProvisioned(String mdn) { + return !(TextUtils.isEmpty(mdn) || mdn.matches("[\\D0]+")); + } } }