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

Commit ce537029 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Update usages of deprecated setDeferUntilActive() API." into udc-dev am: 6fc98811 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21913427



Change-Id: I5dc7df5c378fd875d54b339593c225c2e745f082
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 003d4a41 6fc98811

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -18137,7 +18137,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);

                final Bundle configChangedOptions = new BroadcastOptions()

                        .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT)

                        .setDeferUntilActive(true)

                        .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE)

                        .toBundle();

                broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null,

                        null, null, OP_NONE, configChangedOptions, false, false, MY_PID, SYSTEM_UID,
@@ -18156,7 +18156,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                            PowerExemptionManager.REASON_LOCALE_CHANGED, "");

                    bOptions.setDeliveryGroupPolicy(

                            BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT);

                    bOptions.setDeferUntilActive(true);

                    bOptions.setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE);

                    broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null,

                            null, null, OP_NONE, bOptions.toBundle(), false, false, MY_PID,

                            SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(),
@@ -18201,7 +18201,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














                final BroadcastOptions options = new BroadcastOptions()















                        .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT)













                        .setDeferUntilActive(true);













                        .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE);















                if (reason != null) {















                    options.setDeliveryGroupMatchingKey(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, reason);















                }