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

Commit f9e2e5e6 authored by Tyler Wear's avatar Tyler Wear Committed by Jack Yu
Browse files

IMSI Encryption Support Over IRadio 

Trigger setCarrierInfoForImsiEncryption to RIL for
IRadio 1.6.

Test: Manual
Bug: 142333634
Change-Id: Iceef04686fbad4bc017aace1a250bb95e3bef82c
parent 93c50125

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

+7 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ public class GsmCdmaPhone extends Phone { 
        mCi.registerForRilConnected(this, EVENT_RIL_CONNECTED, null);

        mCi.registerForVoiceRadioTechChanged(this, EVENT_VOICE_RADIO_TECH_CHANGED, null);

        mCi.registerForLceInfo(this, EVENT_LINK_CAPACITY_CHANGED, null);

        mCi.registerForCarrierInfoForImsiEncryption(this,

                EVENT_RESET_CARRIER_KEY_IMSI_ENCRYPTION, null);

        IntentFilter filter = new IntentFilter(

                CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        filter.addAction(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED);
@@ -1880,6 +1882,7 @@ public class GsmCdmaPhone extends Phone { 
    @Override

    public void setCarrierInfoForImsiEncryption(ImsiEncryptionInfo imsiEncryptionInfo) {

        CarrierInfoManager.setCarrierInfoForImsiEncryption(imsiEncryptionInfo, mContext, mPhoneId);

        mCi.setCarrierInfoForImsiEncryption(imsiEncryptionInfo, null);

    }



    @Override
@@ -3200,6 +3203,10 @@ public class GsmCdmaPhone extends Phone { 
                }

                break;

            }

            case EVENT_RESET_CARRIER_KEY_IMSI_ENCRYPTION: {

                resetCarrierKeysForImsiEncryption();

                break;

            }

            default:

                super.handleMessage(msg);

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -229,8 +229,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    protected static final int EVENT_REGISTRATION_FAILED = 57;

    protected static final int EVENT_BARRING_INFO_CHANGED = 58;

    protected static final int EVENT_LINK_CAPACITY_CHANGED = 59;

    protected static final int EVENT_RESET_CARRIER_KEY_IMSI_ENCRYPTION = 60;



    protected static final int EVENT_LAST = EVENT_LINK_CAPACITY_CHANGED;

    protected static final int EVENT_LAST = EVENT_RESET_CARRIER_KEY_IMSI_ENCRYPTION;



    // For shared prefs.

    private static final String GSM_ROAMING_LIST_OVERRIDE_PREFIX = "gsm_roaming_list_";

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

+29 −1
Original line number Diff line number Diff line
@@ -5505,7 +5505,35 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        checkNotNull(imsiEncryptionInfo, "ImsiEncryptionInfo cannot be null.");

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_1)) {

            if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_6)) {

                android.hardware.radio.V1_6.IRadio radioProxy16 =

                        (android.hardware.radio.V1_6.IRadio ) radioProxy;



                RILRequest rr = obtainRequest(RIL_REQUEST_SET_CARRIER_INFO_IMSI_ENCRYPTION, result,

                        mRILDefaultWorkSource);

                if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));



                try {

                    android.hardware.radio.V1_6.ImsiEncryptionInfo halImsiInfo =

                            new android.hardware.radio.V1_6.ImsiEncryptionInfo();

                    halImsiInfo.base.mnc = imsiEncryptionInfo.getMnc();

                    halImsiInfo.base.mcc = imsiEncryptionInfo.getMcc();

                    halImsiInfo.base.keyIdentifier = imsiEncryptionInfo.getKeyIdentifier();

                    if (imsiEncryptionInfo.getExpirationTime() != null) {

                        halImsiInfo.base.expirationTime =

                                imsiEncryptionInfo.getExpirationTime().getTime();

                    }

                    for (byte b : imsiEncryptionInfo.getPublicKey().getEncoded()) {

                        halImsiInfo.base.carrierKey.add(new Byte(b));

                    }

                    halImsiInfo.keyType = imsiEncryptionInfo.getKeyType();



                    radioProxy16.setCarrierInfoForImsiEncryption_1_6(

                            rr.mSerial, halImsiInfo);

                } catch (RemoteException | RuntimeException e) {

                    handleRadioProxyExceptionForRR(rr, "setCarrierInfoForImsiEncryption", e);

                }

            } else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_1)) {

                android.hardware.radio.V1_1.IRadio radioProxy11 =

                        (android.hardware.radio.V1_1.IRadio ) radioProxy;