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

Commit 64c21078 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 

automerge: 45736edd

* commit '45736edd':
  Don't launch broadcast receiver processes during boot
parents 3373d226 45736edd

src/java/com/android/internal/telephony/uicc/IccCardProxy.java

+4 −2
Original line number Diff line number Diff line
@@ -477,7 +477,8 @@ public class IccCardProxy extends Handler implements IccCard { 
            }



            Intent intent = new Intent(TelephonyIntents.ACTION_SIM_STATE_CHANGED);

            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                    | Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

            intent.putExtra(PhoneConstants.PHONE_NAME_KEY, "Phone");

            intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE, value);

            intent.putExtra(IccCardConstants.INTENT_KEY_LOCKED_REASON, reason);
@@ -497,7 +498,8 @@ public class IccCardProxy extends Handler implements IccCard { 
            }



            Intent intent = new Intent(ACTION_INTERNAL_SIM_STATE_CHANGED);

            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING

                    | Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

            intent.putExtra(PhoneConstants.PHONE_NAME_KEY, "Phone");

            intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE, value);

            intent.putExtra(IccCardConstants.INTENT_KEY_LOCKED_REASON, reason);