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

Use ART Service for package install compilation if enabled.

Browse Source 
Test: adb install out/target/product/vsoc_x86_64/system/app/EasterEgg/EasterEgg.apk
  Check that ART Service's Utils.isInDalvikCache correctly returns true
  and false, respectively, before and after that.
Bug: 251903639
Change-Id: Ia612ce7feae278c796c55eaa92b546a65dc122cf
This commit is contained in:
Martin Stjernholm
2023-01-13 23:08:25 +00:00
parent 9eba81e6a7
commit acb6adddd4
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -158,6 +158,8 @@ import com.android.internal.util.ArrayUtils;
import com.android.internal.util.CollectionUtils;
import com.android.internal.util.FrameworkStatsLog;
import com.android.server.EventLogTags;
import com.android.server.LocalManagerRegistry;
import com.android.server.art.model.DexoptParams;
import com.android.server.pm.Installer.LegacyDexoptDisabledException;
import com.android.server.pm.dex.ArtManagerService;
import com.android.server.pm.dex.DexManager;
@@ -2392,6 +2394,7 @@ final class InstallPackageHelper {
|| installRequest.getInstallReason() == INSTALL_REASON_DEVICE_SETUP;
final int dexoptFlags = DexoptOptions.DEXOPT_BOOT_COMPLETE
| DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES
| DexoptOptions.DEXOPT_INSTALL_WITH_DEX_METADATA_FILE
| (isBackupOrRestore ? DexoptOptions.DEXOPT_FOR_RESTORE : 0);
DexoptOptions dexoptOptions =
@@ -2452,13 +2455,25 @@ final class InstallPackageHelper {
realPkgSetting.getPkgState().setUpdatedSystemApp(isUpdatedSystemApp);
// TODO(b/251903639): Call into ART Service.
try {
mPackageDexOptimizer.performDexOpt(pkg, realPkgSetting,
null /* instructionSets */, mPm.getOrCreateCompilerPackageStats(pkg),
mDexManager.getPackageUseInfoOrDefault(packageName), dexoptOptions);
} catch (LegacyDexoptDisabledException e) {
throw new RuntimeException(e);
if (useArtService()) {
PackageManagerLocal packageManagerLocal =
LocalManagerRegistry.getManager(PackageManagerLocal.class);
try (PackageManagerLocal.FilteredSnapshot snapshot =
packageManagerLocal.withFilteredSnapshot()) {
DexoptParams params =
dexoptOptions.convertToDexoptParams(0 /* extraFlags */);
DexOptHelper.getArtManagerLocal().dexoptPackage(
snapshot, packageName, params);
}
} else {
try {
mPackageDexOptimizer.performDexOpt(pkg, realPkgSetting,
null /* instructionSets */,
mPm.getOrCreateCompilerPackageStats(pkg),
mDexManager.getPackageUseInfoOrDefault(packageName), dexoptOptions);
} catch (LegacyDexoptDisabledException e) {
throw new RuntimeException(e);
}
}
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
}