diff options
| author | 2023-03-09 04:27:47 +0000 | |
|---|---|---|
| committer | 2023-03-09 04:27:47 +0000 | |
| commit | 6fc98811d0c4f01799f188a738dfd9dee569d035 (patch) | |
| tree | 6969d6097c1f3e30f75b1014afb9046633f9700d | |
| parent | 2daf0364311a3f90911f3a1d65572c672b4066f6 (diff) | |
| parent | 3ba64a1598688b1e1a5bce5594b007561c91e23a (diff) | |
Merge "Update usages of deprecated setDeferUntilActive() API." into udc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 04e9b1ec426a..10450f032ffb 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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); } |