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

Commit 787b0c5f authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Fixed ImsiKey delete issue when pSim eject time." into main

parents ffe522ba b488855b

flags/uicc.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -69,3 +69,14 @@ flag { 
    description: "This flag controls optimization of apdu sender class."

    bug:"335257880"

}



# OWNER=arunvoddu TARGET=24Q4

flag {

    name: "ignore_carrierid_reset_for_sim_removal"

    namespace: "telephony"

    description: "This flag controls the carrierId reset while imsi key deletion time upon sim ejection."

    bug:"366178705"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

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

+7 −1
Original line number Diff line number Diff line
@@ -170,7 +170,13 @@ public class CarrierKeyDownloadManager extends Handler { 
                                                TelephonyManager.class)

                                        .createForSubscriptionId(subId);

                            }

                            if (Flags.ignoreCarrieridResetForSimRemoval()) {

                                if (carrierId > 0) {

                                    mCarrierId = carrierId;

                                }

                            } else {

                                mCarrierId = carrierId;

                            }

                            updateSimOperator();

                            // If device is screen locked do not proceed to handle

                            // EVENT_ALARM_OR_CONFIG_CHANGE