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

Commit f4d8c9f0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Decouple the carrier key with data SIM" am: 43fd895d am: f3aa980e 

Change-Id: I7f8c537512a26ffeb9436f104e4073c504a5e363
parents 68802fa8 f3aa980e

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

+6 −8
Original line number Original line Diff line number Diff line
@@ -57,18 +57,16 @@ public class CarrierInfoManager { 
     *         used for encryption.

     *         used for encryption.

     */

     */

    public static ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType,

    public static ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType,

                                                                     Context context) {

                                                                     Context context,

                                                                     String operatorNumeric) {

        String mcc = "";

        String mcc = "";

        String mnc = "";

        String mnc = "";

        final TelephonyManager telephonyManager =

        if (!TextUtils.isEmpty(operatorNumeric)) {

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

            mcc = operatorNumeric.substring(0, 3);

        String simOperator = telephonyManager.getSimOperator();

            mnc = operatorNumeric.substring(3);

        if (!TextUtils.isEmpty(simOperator)) {

            mcc = simOperator.substring(0, 3);

            mnc = simOperator.substring(3);

            Log.i(LOG_TAG, "using values for mnc, mcc: " + mnc + "," + mcc);

            Log.i(LOG_TAG, "using values for mnc, mcc: " + mnc + "," + mcc);

        } else {

        } else {

            Log.e(LOG_TAG, "Invalid networkOperator: " + simOperator);

            Log.e(LOG_TAG, "Invalid networkOperator: " + operatorNumeric);

            return null;

            return null;

        }

        }

        Cursor findCursor = null;

        Cursor findCursor = null;

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

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




    @Override

    @Override

    public ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType) {

    public ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int keyType) {

        return CarrierInfoManager.getCarrierInfoForImsiEncryption(keyType, mContext);

        String operatorNumeric = TelephonyManager.from(mContext)

                .getSimOperatorNumericForPhone(mPhoneId);

        return CarrierInfoManager.getCarrierInfoForImsiEncryption(keyType,

                mContext, operatorNumeric);

    }

    }





    @Override

    @Override