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

Commit eeb475f1 authored by Meng Wang's avatar Meng Wang Committed by Gerrit Code Review
Browse files

Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK"

parents e2282d11 402b0e93

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 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)) {

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

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

                    return;

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class IntentBroadcaster { 
                    while (iterator.hasNext()) {

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

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

                        i.putExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK, true);

                        i.putExtra(Intent.EXTRA_REBROADCAST_ON_UNLOCK, true);

                        iterator.remove();

                        logd("Rebroadcasting intent " + i.getAction() + " "

                                + i.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE)