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