Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977

Change-Id: Ib9bbc21fec23a32a6b6cc425196b1150976c2386
This commit is contained in:
Treehugger Robot
2020-04-07 03:36:56 +00:00
committed by Automerger Merge Worker

View File

@@ -23,6 +23,7 @@ import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -179,11 +180,16 @@ public class SimListDialogFragment extends SimDialogFragment implements
Utils.getColorAttr(mContext, android.R.attr.textColorSecondary)); Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
} else { } else {
title.setText(sub.getDisplayName()); title.setText(sub.getDisplayName());
summary.setText(sub.getNumber()); summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : "");
icon.setImageBitmap(sub.createIconBitmap(mContext)); icon.setImageBitmap(sub.createIconBitmap(mContext));
} }
return convertView; 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]+"));
}
} }
} }