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

Commit 4e7888d3 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Use fg broadcast for pkg suspension and quiet mode" into udc-dev am: 7447c6b9 

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



Change-Id: Ifb84bedda77b016e2205e0a887ea3862726714c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44cc61a0 7447c6b9

services/core/java/com/android/server/pm/SuspendPackageHelper.java

+3 −3
Original line number Diff line number Diff line
@@ -619,10 +619,10 @@ public final class SuspendPackageHelper { 
        final Bundle extras = new Bundle(3);

        extras.putStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST, pkgList);

        extras.putIntArray(Intent.EXTRA_CHANGED_UID_LIST, uidList);

        final int flags = Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND;

        handler.post(() -> mBroadcastHelper.sendPackageBroadcast(intent, null /* pkg */,

                extras, Intent.FLAG_RECEIVER_REGISTERED_ONLY, null /* targetPkg */,

                null /* finishedReceiver */, new int[]{userId}, null /* instantUserIds */,

                null /* broadcastAllowList */,

                extras, flags, null /* targetPkg */, null /* finishedReceiver */,

                new int[]{userId}, null /* instantUserIds */, null /* broadcastAllowList */,

                (callingUid, intentExtras) -> BroadcastHelper.filterExtrasChangedPackageList(

                        mPm.snapshotComputer(), callingUid, intentExtras),

                null /* bOptions */));

services/core/java/com/android/server/pm/UserManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ public class UserManagerService extends IUserManager.Stub { 
        intent.putExtra(Intent.EXTRA_USER_HANDLE, profileHandle.getIdentifier());

        getDevicePolicyManagerInternal().broadcastIntentToManifestReceivers(

                intent, parentHandle, /* requiresPermission= */ true);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND);

        mContext.sendBroadcastAsUser(intent, parentHandle);

    }