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

Commit 1c966291 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Use subid in deleteCarrierInfoForImsiEncryption" into sc-dev

parents 937f06f7 852dc446

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

+11 −5
Original line number Diff line number Diff line
@@ -254,7 +254,13 @@ public class CarrierInfoManager { 
            return;

        }

        mLastAccessResetCarrierKey = now;

        deleteCarrierInfoForImsiEncryption(context);

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

                .getSubscriptionIds(mPhoneId);

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

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

            return;

        }

        deleteCarrierInfoForImsiEncryption(context, subIds[0]);

        Intent resetIntent = new Intent(TelephonyIntents.ACTION_CARRIER_CERTIFICATE_DOWNLOAD);

        SubscriptionManager.putPhoneIdAndSubIdExtra(resetIntent, mPhoneId);

        context.sendBroadcastAsUser(resetIntent, UserHandle.ALL);
@@ -264,12 +270,12 @@ public class CarrierInfoManager { 
     * Deletes all the keys for a given Carrier from the device keystore.

     * @param context Context

     */

    public static void deleteCarrierInfoForImsiEncryption(Context context) {

        Log.i(LOG_TAG, "deleting carrier key from db");

    public static void deleteCarrierInfoForImsiEncryption(Context context, int subId) {

        Log.i(LOG_TAG, "deleting carrier key from db for subId=" + subId);

        String mcc = "";

        String mnc = "";

        final TelephonyManager telephonyManager =

                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

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

                .createForSubscriptionId(subId);

        String simOperator = telephonyManager.getSimOperator();

        if (!TextUtils.isEmpty(simOperator)) {

            mcc = simOperator.substring(0, 3);

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

+1 −1
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public void deleteCarrierInfoForImsiEncryption() {

        CarrierInfoManager.deleteCarrierInfoForImsiEncryption(mContext);

        CarrierInfoManager.deleteCarrierInfoForImsiEncryption(mContext, getSubId());

    }



    @Override