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

Commit ec4d08e5 authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "Rename BroadcastOptions.setAllowBackgroundActivityStarts() to... 

Merge "Rename BroadcastOptions.setAllowBackgroundActivityStarts() to setBackgroundActivityStartsAllowed()"
parents a177c3e1 9af36516

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

+1 −1
Original line number Diff line number Diff line
@@ -2440,7 +2440,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    public void sendDialerSpecialCode(String code) {

        if (!TextUtils.isEmpty(code)) {

            final BroadcastOptions options = BroadcastOptions.makeBasic();

            options.setAllowBackgroundActivityStarts(true);

            options.setBackgroundActivityStartsAllowed(true);

            Intent intent = new Intent(TelephonyIntents.SECRET_CODE_ACTION,

                    Uri.parse("android_secret_code://" + code));

            intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

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

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ public class UiccController extends Handler { 


        // broadcast slot status changed

        final BroadcastOptions options = BroadcastOptions.makeBasic();

        options.setAllowBackgroundActivityStarts(true);

        options.setBackgroundActivityStartsAllowed(true);

        Intent intent = new Intent(TelephonyManager.ACTION_SIM_SLOT_STATUS_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);