Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)"

Browse Source 
am: 2f1c32ef23

Change-Id: I1d34b1d5cb8f6b1f25269ee0238d6f4dba33ac50
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-25 15:56:54 -08:00
committed by android-build-merger
parent 19c52ea987 2f1c32ef23
commit 3fdb0fbc87
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/common/com/google/android/mms/pdu/PduPersister.java
View File

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