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

Commit 2034e081 authored by Jack Yu's avatar Jack Yu
Browse files

Cleaned up the deprecated APIs 

Bug: 270094276
Test: Basic phone funcationality tests
Change-Id: If3bcaee5c9426f79024bcbcee10aceff120811f8
parent f6db23cc

src/java/com/android/internal/telephony/CarrierInfoManager.java

+6 −5
Original line number Diff line number Diff line
@@ -287,16 +287,17 @@ public class CarrierInfoManager { 
            return;

        }

        mLastAccessResetCarrierKey = now;

        int[] subIds = context.getSystemService(SubscriptionManager.class)

                .getSubscriptionIds(mPhoneId);

        if (subIds == null || subIds.length < 1) {



        int subId = SubscriptionManager.getSubscriptionId(mPhoneId);

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            Log.e(LOG_TAG, "Could not reset carrier keys, subscription for mPhoneId=" + mPhoneId);

            return;

        }



        final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)

                .createForSubscriptionId(subIds[0]);

                .createForSubscriptionId(subId);

        int carrierId = telephonyManager.getSimCarrierId();

        deleteCarrierInfoForImsiEncryption(context, subIds[0], carrierId);

        deleteCarrierInfoForImsiEncryption(context, subId, carrierId);

        Intent resetIntent = new Intent(TelephonyIntents.ACTION_CARRIER_CERTIFICATE_DOWNLOAD);

        SubscriptionManager.putPhoneIdAndSubIdExtra(resetIntent, mPhoneId);

        context.sendBroadcastAsUser(resetIntent, UserHandle.ALL);