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

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

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

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



Change-Id: Id9d1d3561a11e8748ead273c181f3aade96358ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4c69d45 a5a807eb

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

+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);















            }















        }