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

Merge "Remove PMS dropNonSystemPackages" into sc-dev am: 84f4ecec39 am: 49b2fca4f8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273763

Change-Id: I8b90cc4ac3c849d240648a3a8e90620f9f3328a4
This commit is contained in:
TreeHugger Robot
2021-07-13 21:16:21 +00:00
committed by Automerger Merge Worker
parent 0bdaaf761b 49b2fca4f8
commit 0c9b0f3c7f
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;
@@ -23625,18 +23623,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(
@@ -27286,7 +27272,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) {