diff options
| author | Jiakai Zhang <jiakaiz@google.com> | 2024-03-21 22:27:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-21 22:27:02 +0000 |
| commit | ffe63966ee48b35a567e483983a2f73a42e5c253 (patch) | |
| tree | 4c9b45c9c69efc11e5a11b19c64dd42b5fdb8ba4 | |
| parent | ffd9e2bb8f0aa2fb8625f681f739cf57cae26a73 (diff) | |
| parent | 4ab0f20684661bba0223448d9cb01c7d8c15ae3e (diff) | |
| download | base-ffe63966ee48b35a567e483983a2f73a42e5c253.tar.gz | |
Merge "Retire use_art_service_v2 flag and dalvik.vm.features properties." into main
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallRequest.java | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 600aff290193..a5c323ab287c 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -112,7 +112,6 @@ import android.content.IntentSender; import android.content.pm.ApplicationInfo; import android.content.pm.ArchivedPackageParcel; import android.content.pm.DataLoaderType; -import android.content.pm.Flags; import android.content.pm.PackageInfo; import android.content.pm.PackageInfoLite; import android.content.pm.PackageInstaller; @@ -2556,9 +2555,7 @@ final class InstallPackageHelper { & PackageManager.INSTALL_IGNORE_DEXOPT_PROFILE) != 0; /*@DexoptFlags*/ int extraFlags = - ignoreDexoptProfile && Flags.useArtServiceV2() - ? ArtFlags.FLAG_IGNORE_PROFILE - : 0; + ignoreDexoptProfile ? ArtFlags.FLAG_IGNORE_PROFILE : 0; DexoptParams params = dexoptOptions.convertToDexoptParams(extraFlags); DexoptResult dexOptResult = DexOptHelper.getArtManagerLocal().dexoptPackage( snapshot, packageName, params); diff --git a/services/core/java/com/android/server/pm/InstallRequest.java b/services/core/java/com/android/server/pm/InstallRequest.java index ee780d99b6b6..dcb9f1aad814 100644 --- a/services/core/java/com/android/server/pm/InstallRequest.java +++ b/services/core/java/com/android/server/pm/InstallRequest.java @@ -35,7 +35,6 @@ import android.apex.ApexInfo; import android.app.AppOpsManager; import android.content.pm.ArchivedPackageParcel; import android.content.pm.DataLoaderType; -import android.content.pm.Flags; import android.content.pm.IPackageInstallObserver2; import android.content.pm.PackageInstaller; import android.content.pm.PackageManager; @@ -931,7 +930,7 @@ final class InstallRequest { // Only report external profile warnings when installing from adb. The goal is to warn app // developers if they have provided bad external profiles, so it's not beneficial to report // those warnings in the normal app install workflow. - if (isInstallFromAdb() && Flags.useArtServiceV2()) { + if (isInstallFromAdb()) { var externalProfileErrors = new LinkedHashSet<String>(); for (PackageDexoptResult packageResult : dexoptResult.getPackageDexoptResults()) { for (DexContainerFileDexoptResult fileResult : |