From e64e8ea21a735edf76f2242b65df46fda9bb6854 Mon Sep 17 00:00:00 2001 From: Sumedh Sen Date: Fri, 27 Jan 2023 14:24:30 -0800 Subject: [PATCH] Fix filtering logic for stopped packages System apps can also be in a stopped state, per b/249514169. As such, while checking if a package is stopped for a user, skip checking if its not a system package. Bug: 249514169 Test: atest CtsContentTestCases:SystemPackageDefaultStoppedStateTest Change-Id: Ib64f3b62cb8a3e1d580d55bfdcd904e52103d394 --- .../com/android/server/pm/resolution/ComponentResolver.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/resolution/ComponentResolver.java b/services/core/java/com/android/server/pm/resolution/ComponentResolver.java index 35c42a310efd9..fac681aaf1c47 100644 --- a/services/core/java/com/android/server/pm/resolution/ComponentResolver.java +++ b/services/core/java/com/android/server/pm/resolution/ComponentResolver.java @@ -943,11 +943,7 @@ public class ComponentResolver extends ComponentResolverLocked implements return false; } - // System apps are never considered stopped for purposes of - // filtering, because there may be no way for the user to - // actually re-launch them. - return !packageState.isSystem() - && packageState.getUserStateOrDefault(userId).isStopped(); + return packageState.getUserStateOrDefault(userId).isStopped(); } }