Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" am: 2f1c32ef23

am: 3fdb0fbc87

Change-Id: I3dc4572e3b3d2c80a446d78fb0785f8f63bf2391
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-25 16:03:45 -08:00
committed by android-build-merger

View File

@@ -291,15 +291,11 @@ public class PduPersister {
@UnsupportedAppUsage
private final ContentResolver mContentResolver;
private final DrmManagerClient mDrmManagerClient;
@UnsupportedAppUsage
private final TelephonyManager mTelephonyManager;
private PduPersister(Context context) {
mContext = context;
mContentResolver = context.getContentResolver();
mDrmManagerClient = new DrmManagerClient(context);
mTelephonyManager = (TelephonyManager)context
.getSystemService(Context.TELEPHONY_SERVICE);
}
/** Get(or create if not exist) an instance of PduPersister */
@@ -1453,7 +1449,8 @@ public class PduPersister {
if (excludeMyNumber) {
// Build a list of my phone numbers from the various sims.
for (int subid : subscriptionManager.getActiveSubscriptionIdList()) {
final String myNumber = mTelephonyManager.getLine1Number(subid);
final String myNumber = mContext.getSystemService(TelephonyManager.class).
createForSubscriptionId(subid).getLine1Number();
if (myNumber != null) {
myPhoneNumbers.add(myNumber);
}