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

Commit 3b58921a authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Fix logic checking if suspension changed" into main

parents 20812b93 076d5a08

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

+4 −4
Original line number Diff line number Diff line
@@ -120,8 +120,8 @@ public final class SuspendPackageHelper { 
            return packageNames;

        }



        final SuspendParams newSuspendParams =

                new SuspendParams(dialogInfo, appExtras, launcherExtras, quarantined);

        final SuspendParams newSuspendParams = suspended

                ? new SuspendParams(dialogInfo, appExtras, launcherExtras, quarantined) : null;



        final List<String> unmodifiablePackages = new ArrayList<>(packageNames.length);
@@ -156,8 +156,8 @@ public final class SuspendPackageHelper { 


            final WatchedArrayMap<String, SuspendParams> suspendParamsMap =

                    packageState.getUserStateOrDefault(userId).getSuspendParams();

            SuspendParams oldSuspendParams = suspendParamsMap == null

                    ? null : suspendParamsMap.get(packageName);

            final SuspendParams oldSuspendParams = suspendParamsMap == null

                    ? null : suspendParamsMap.get(callingPackage);

            boolean changed = !Objects.equals(oldSuspendParams, newSuspendParams);



            if (suspended && !changed) {