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

Commit a5a807eb authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Apply delivery group policies to CLOSE_SYSTEM_DIALOG broadcast." into udc-dev

parents 4a2a68d4 9ba128c0
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -18203,8 +18203,14 @@ public class ActivityManagerService extends IActivityManager.Stub
                    intent.putExtra("reason", reason);
                }
                final BroadcastOptions options = new BroadcastOptions()
                        .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT)
                        .setDeferUntilActive(true);
                if (reason != null) {
                    options.setDeliveryGroupMatchingKey(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, reason);
                }
                broadcastIntentLocked(null, null, null, intent, null, null, 0, null, null, null,
                        null, null, OP_NONE, null, false, false, -1, SYSTEM_UID,
                        null, null, OP_NONE, options.toBundle(), false, false, -1, SYSTEM_UID,
                        Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.USER_ALL);
            }
        }