Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d940da authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

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

Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" am: 2f1c32ef am: 3fdb0fbc
am: 2fc63853

Change-Id: Ifb8410dbb81cdc55c109ef8d7b190e1d9f6bf852
parents 91b40826 2fc63853

telephony/common/com/google/android/mms/pdu/PduPersister.java

+2 −5
Original line number Diff line number Diff line
@@ -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);

                }