From acdbd498702b8a7810f19d49e0c16d71f5061880 Mon Sep 17 00:00:00 2001 From: Winson Date: Tue, 13 Jul 2021 10:00:43 -0700 Subject: [PATCH] Remove PMS dropNonSystemPackages This seems to have been added in error. A filterOnlySystemPackages wrapper already exists, which performs the same function. There are packages which are not required to be preinstalled system apps, and using the non-specific dropNonSystemPackages wrapper would accidentally strip those packages from the known set. Bug: 192915574 Test: presubmit Change-Id: I490c331653a2aac210ec090d1b5a96a7126f9fa4 --- .../android/server/pm/PackageManagerService.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ccb3c974d7ba1..f462892411c4a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -112,8 +112,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility; import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE; import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO_PARENT; import static com.android.internal.content.NativeLibraryHelper.LIB_DIR_NAME; -import static com.android.internal.util.ArrayUtils.emptyIfNull; -import static com.android.internal.util.ArrayUtils.filter; import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_DATA_APP_AVG_SCAN_TIME; import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_INIT_TIME; import static com.android.internal.util.FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__OTA_PACKAGE_MANAGER_SYSTEM_APP_AVG_SCAN_TIME; @@ -23632,18 +23630,6 @@ public class PackageManagerService extends IPackageManager.Stub getPackageFromComponentString(R.string.config_defaultAppPredictionService)); } - private @NonNull String[] dropNonSystemPackages(@NonNull String[] pkgNames) { - return emptyIfNull(filter(pkgNames, String[]::new, mIsSystemPackage), String.class); - } - - private Predicate mIsSystemPackage = (pkgName) -> { - if ("android".equals(pkgName)) { - return true; - } - AndroidPackage pkg = mPackages.get(pkgName); - return pkg != null && pkg.isSystem(); - }; - @Override public String getSystemCaptionsServicePackageName() { return ensureSystemPackageName( @@ -27267,7 +27253,7 @@ public class PackageManagerService extends IPackageManager.Stub @Override public @NonNull String[] getKnownPackageNames(int knownPackage, int userId) { - return dropNonSystemPackages(getKnownPackageNamesInternal(knownPackage, userId)); + return getKnownPackageNamesInternal(knownPackage, userId); } private String[] getKnownPackageNamesInternal(int knownPackage, int userId) {