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

Commit b8af724f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if caller is suspending package before unsuspended broadcast"... 

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

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



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

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

+5 −3
Original line number Diff line number Diff line
@@ -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()));