Merge "Fix logic checking if suspension changed" into main (3b58921a) · Commits · e / os / android_frameworks_base

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

+4 −4

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

	final SuspendParams newSuspendParams =		final SuspendParams newSuspendParams = suspended
	new SuspendParams(dialogInfo, appExtras, launcherExtras, quarantined);		? new SuspendParams(dialogInfo, appExtras, launcherExtras, quarantined) : null;

	final List<String> unmodifiablePackages = new ArrayList<>(packageNames.length);		final List<String> unmodifiablePackages = new ArrayList<>(packageNames.length);

	@@ -156,8 +156,8 @@ public final class SuspendPackageHelper {

	final WatchedArrayMap<String, SuspendParams> suspendParamsMap =		final WatchedArrayMap<String, SuspendParams> suspendParamsMap =
	packageState.getUserStateOrDefault(userId).getSuspendParams();		packageState.getUserStateOrDefault(userId).getSuspendParams();
	SuspendParams oldSuspendParams = suspendParamsMap == null		final SuspendParams oldSuspendParams = suspendParamsMap == null
	? null : suspendParamsMap.get(packageName);		? null : suspendParamsMap.get(callingPackage);
	boolean changed = !Objects.equals(oldSuspendParams, newSuspendParams);		boolean changed = !Objects.equals(oldSuspendParams, newSuspendParams);

	if (suspended && !changed) {		if (suspended && !changed) {