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

Commit b0d15a71 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "add an extra for rebroadcast of sim_state_change" into oc-dev 

am: 74db1a77

Change-Id: If8c27f7fc2465219815b8d68dd303b2d6a1d532b
parents b25073bd 74db1a77

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

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ public class CarrierActionAgent extends Handler { 
            final String action = intent.getAction();

            final String iccState = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);

            if (TelephonyIntents.ACTION_SIM_STATE_CHANGED.equals(action)){

                if (intent.getBooleanExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK, false)) {

                    // ignore rebroadcast since carrier apps are direct boot aware.

                    return;

                }

                if (IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(iccState) ||

                        IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(iccState)) {

                    sendEmptyMessage(CARRIER_ACTION_RESET);

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

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ public class SubscriptionInfoUpdater extends Handler { 
                while (iterator.hasNext()) {

                    Map.Entry pair = (Map.Entry) iterator.next();

                    Intent i = (Intent)pair.getValue();

                    i.putExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK, true);

                    iterator.remove();

                    logd("Broadcasting intent ACTION_SIM_STATE_CHANGED for mCardIndex: " +

                            pair.getKey());