Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PMS dropNonSystemPackages

Browse Source 
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
This commit is contained in:
Winson
2021-07-13 10:00:43 -07:00
parent 10239a0c9c
commit acdbd49870
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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<String> 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) {