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

Remove the "android" package from dexopting.

Browse Source 
We no longer allow dexopting the system server, so we need to ensure it
isn't added to the list of packages to dexopt.

Test: adb shell pm compile -m speed-profile -f -a
  with dalvik.vm.useartservice=false
Bug: 274576247
Change-Id: I9da100987e611e59ac6ef2282bf0221d9417bc9a
This commit is contained in:
Martin Stjernholm
2023-03-30 17:16:01 +01:00
parent 9d56ebbc43
commit 0d511e900f
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;
@@ -1950,6 +1951,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) {