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

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

Merge cherrypicks of [2619075, 2619057, 2619058, 2619037, 2619061, 2619062,... 

Merge cherrypicks of [2619075, 2619057, 2619058, 2619037, 2619061, 2619062, 2619041, 2619076, 2619081, 2619069, 2619135, 2619171, 2619172, 2619153, 2619154, 2619155, 2619173, 2619156, 2619157, 2619174, 2619136, 2619138, 2619139, 2619144] into oc-dr1-release

Change-Id: I9e75b68e7e9f39e7a5ac42b5fb989c6b52e896a2
parents ba0f0a30 654c7722

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

+7 −3
Original line number Diff line number Diff line
@@ -152,14 +152,18 @@ public class CarrierActionAgent extends Handler { 
                    mSettingsObserver.observe(

                            Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON),

                            EVENT_APM_SETTINGS_CHANGED);

                    if (mPhone.getServiceStateTracker() != null) {

                        mPhone.getServiceStateTracker().registerForDataRoamingOff(

                                this, EVENT_DATA_ROAMING_OFF, null, false);

                    }

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

                    log("EVENT_SIM_STATE_CHANGED status: " + iccState);

                    carrierActionReset();

                    mSettingsObserver.unobserve();

                    if (mPhone.getServiceStateTracker() != null) {

                        mPhone.getServiceStateTracker().unregisterForDataRoamingOff(this);

                    }

                }

                break;

            default:

                loge("Unknown carrier action: " + msg.what);

tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,

                IccCardConstants.INTENT_VALUE_ICC_LOADED);

        mContext.sendBroadcast(intent);

        waitForMs(100);

        waitForMs(200);



        // carrier actions triggered from sim loading

        ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);