Merge "Check if caller is suspending package before unsuspended broadcast" into tm-qpr-dev am: f7175f45f5

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

Change-Id: I5de0172a4d9a436afd3cdb0fca57afdbb8a7682b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-13 23:39:03 +00:00
committed by Automerger Merge Worker

View File

@@ -160,9 +160,11 @@ public final class SuspendPackageHelper {
}
}
// If size one, the package will be unsuspended from this call
boolean packageUnsuspended =
!suspended && CollectionUtils.size(suspendParamsMap) <= 1;
// If only the callingPackage is suspending this package,
// it will be unsuspended when this change is committed
boolean packageUnsuspended = !suspended
&& CollectionUtils.size(suspendParamsMap) == 1
&& suspendParamsMap.containsKey(callingPackage);
if (suspended || packageUnsuspended) {
changedPackagesList.add(packageName);
changedUids.add(UserHandle.getUid(userId, packageState.getAppId()));