diff options
| author | 2022-10-24 18:01:51 +0000 | |
|---|---|---|
| committer | 2022-10-24 18:01:51 +0000 | |
| commit | 8afc936a4ed616f9e18ab19810a62ce55f22cdf2 (patch) | |
| tree | 6b7c1f24021ab6e529c4c46e90da30992221961b | |
| parent | f7ccbed31dd32d0adf75316eeab06df34dd9d232 (diff) | |
| parent | 83e5e365437895b3e26906e86cae24699617506b (diff) | |
Merge "Merge "Return no optmization info for package "android"." am: f6b27d6a81 am: 8fbe829de0" into tm-qpr-dev-plus-aosp am: 83e5e36543
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2265082
Change-Id: I3262fd8b4159b01b8b8b51252b82b1d5449d46d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/dex/ArtManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index 37f7ac2d5c82..0bdd98038f83 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -52,6 +52,7 @@ import com.android.internal.util.Preconditions; import com.android.server.LocalServices; import com.android.server.pm.Installer; import com.android.server.pm.Installer.InstallerException; +import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerServiceCompilerMapping; import com.android.server.pm.parsing.PackageInfoUtils; import com.android.server.pm.pkg.AndroidPackage; @@ -724,6 +725,13 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { @Override public PackageOptimizationInfo getPackageOptimizationInfo( ApplicationInfo info, String abi, String activityName) { + if (info.packageName.equals(PackageManagerService.PLATFORM_PACKAGE_NAME)) { + // PackageManagerService.PLATFORM_PACKAGE_NAME in this context means that the + // activity is defined in bootclasspath. Currently, we don't have an API to get the + // correct optimization info. + return PackageOptimizationInfo.createWithNoInfo(); + } + String compilationReason; String compilationFilter; try { |