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

Commit f820182a authored by Sangyun Yun's avatar Sangyun Yun
Browse files

Fix unregisterForDataRoamingOff for eSIM when SIM is not ready. 

Since registerForDataRoamingOff is not registered with addUnique,
thes are cases that is registered multiple times when eSIM is
repeatedly activated/deactivated.

Bug: 353631329
Test: atest FrameworksTelephonyTests:CarrierActionAgentTest
Flag: EXEMPT bugfix
Change-Id: Ief7d0c62f4c2d8afb7becfd89dd91c8c5ff8ad9e
parent 015bc0ee

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

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ public class CarrierActionAgent extends Handler { 
                        mPhone.getServiceStateTracker().registerForDataRoamingOff(

                                this, EVENT_DATA_ROAMING_OFF, null, false);

                    }

                } else if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(iccState)) {

                } else if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(iccState)

                        || IccCardConstants.INTENT_VALUE_ICC_NOT_READY.equals(iccState)) {

                    log("EVENT_SIM_STATE_CHANGED status: " + iccState);

                    carrierActionReset();

                    mSettingsObserver.unobserve();