Merge cherrypicks of [10961387, 10961388, 10961389, 10962537, 10961893, 10961547, 10961390, 10964051, 10964032] into qt-d4-releaseandroid-10.0.0_r43android-10.0.0_r42

Change-Id: Icb970224fba3b98a4d6a4d33bb0ef1114326e7df

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index 3b78927de5..a5d4157818 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]+"));
+        }
     }
 }