Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74d0bf3 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Retire use_art_service_v2 flag and dalvik.vm.features properties." into main am: ffe63966 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3007697



Change-Id: I203d70f25c189f2a97faa827d3a7da2ba3cccbc4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd296af4 ffe63966

services/core/java/com/android/server/pm/InstallPackageHelper.java

+1 −4
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/pm/InstallRequest.java

+1 −2
Original line number Diff line number Diff line
@@ -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 :