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

Merge "Remove the "android" package from dexopting." into udc-dev

Browse Source
This commit is contained in:
Martin Stjernholm
2023-04-21 10:53:18 +00:00
committed by Android (Google) Code Review
parent f1e34af723 0d511e900f
commit bc95ba3231
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/DexOptHelper.java
View File

@@ -745,6 +745,9 @@ public final class DexOptHelper {
applyPackageFilter(snapshot, remainingPredicate, result, remainingPkgSettings, sortTemp,
packageManagerService);
// Make sure the system server isn't in the result, because it can never be dexopted here.
result.removeIf(pkgSetting -> PLATFORM_PACKAGE_NAME.equals(pkgSetting.getPackageName()));
if (debug) {
Log.i(TAG, "Packages to be dexopted: " + packagesToString(result));
Log.i(TAG, "Packages skipped from dexopt: " + packagesToString(remainingPkgSettings));

3
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -24,6 +24,7 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED;
import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET;
import static com.android.server.LocalManagerRegistry.ManagerNotFoundException;
import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
import android.accounts.IAccountManager;
import android.annotation.NonNull;
@@ -1954,6 +1955,8 @@ class PackageManagerShellCommand extends ShellCommand {
List<String> packageNames = null;
if (allPackages) {
packageNames = mInterface.getAllPackages();
// Compiling the system server is only supported from odrefresh, so skip it.
packageNames.removeIf(packageName -> PLATFORM_PACKAGE_NAME.equals(packageName));
} else {
String packageName = getNextArg();
if (packageName == null) {