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

Commit 6c1158c6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7012656 from db017fbe to rvc-qpr2-release 

Change-Id: I705ec02e03e43e07a61288db417a6bab740c7cf3
parents 412f0803 db017fbe

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

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ public class CarrierKeyDownloadManager extends Handler { 
        } else {

            // delete any existing alarms.

            cleanupRenewalAlarms();

            mPhone.deleteCarrierInfoForImsiEncryption();

        }

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -1862,6 +1862,11 @@ public class GsmCdmaPhone extends Phone { 
        CarrierInfoManager.setCarrierInfoForImsiEncryption(imsiEncryptionInfo, mContext, mPhoneId);

    }



    @Override

    public void deleteCarrierInfoForImsiEncryption() {

        CarrierInfoManager.deleteCarrierInfoForImsiEncryption(mContext);

    }



    @Override

    public int getCarrierId() {

        return mCarrierResolver.getCarrierId();

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

+7 −0
Original line number Diff line number Diff line
@@ -3677,6 +3677,13 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        return;

    }



    /**

     * Deletes all the keys for a given Carrier from the device keystore.

     */

    public void deleteCarrierInfoForImsiEncryption() {

        return;

    }



    public int getCarrierId() {

        return TelephonyManager.UNKNOWN_CARRIER_ID;

    }

src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java

+3 −3
Original line number Diff line number Diff line
@@ -1063,13 +1063,13 @@ public class EuiccCard extends UiccCard { 
                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_7, versionBytes);

                break;

            case DEV_CAP_NREPC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_8, versionBytes);

                break;

            case DEV_CAP_NR5GC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);

                break;

            case DEV_CAP_EUTRAN5GC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_11, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);

                break;

            default:

                loge("Invalid device capability name: " + devCap);

src/java/com/android/internal/telephony/uicc/euicc/Tags.java

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ class Tags { 
    static final int TAG_CTX_8 = 0x88;

    static final int TAG_CTX_9 = 0x89;

    static final int TAG_CTX_10 = 0x8A;

    static final int TAG_CTX_11 = 0x8B;



    // Context tags for constructed (compound) types

    static final int TAG_CTX_COMP_0 = 0xA0;