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

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

Merge "Apply delivery group policies to CONFIGURATION_CHANGED broadcast." into... 

Merge "Apply delivery group policies to CONFIGURATION_CHANGED broadcast." into udc-dev am: 4a2a68d4

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



Change-Id: I97b570dfb65d51c590e5cb109c9ccc13ffbcfaed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b60eb365 4a2a68d4

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

+5 −1
Original line number Diff line number Diff line
@@ -18139,8 +18139,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        | Intent.FLAG_RECEIVER_REPLACE_PENDING

                        | Intent.FLAG_RECEIVER_FOREGROUND

                        | Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);

                final Bundle configChangedOptions = new BroadcastOptions()

                        .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT)

                        .setDeferUntilActive(true)

                        .toBundle();

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

                        null, null, OP_NONE, null, false, false, MY_PID, SYSTEM_UID,

                        null, null, OP_NONE, configChangedOptions, false, false, MY_PID, SYSTEM_UID,

                        Binder.getCallingUid(), Binder.getCallingPid(), UserHandle.USER_ALL);

                if ((changes & ActivityInfo.CONFIG_LOCALE) != 0) {

                    intent = new Intent(Intent.ACTION_LOCALE_CHANGED);