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

Commit 2a16b0b4 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Android (Google) Code Review
Browse files

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

parents fce024eb 480b0baa

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

+2 −7
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ApexStagedEvent;

import android.content.pm.Flags;

import android.content.pm.IPackageManagerNative;

import android.content.pm.IStagedApexObserver;

import android.content.pm.PackageManager;
@@ -663,10 +662,8 @@ public final class DexOptHelper { 
            }

        }, new IntentFilter(Intent.ACTION_LOCKED_BOOT_COMPLETED));



        if (Flags.useArtServiceV2()) {

        StagedApexObserver.registerForStagedApexUpdates(artManager);

    }

    }



    /**

     * Returns true if an {@link ArtManagerLocal} instance has been created.
@@ -750,9 +747,7 @@ public final class DexOptHelper { 
                            & 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 = 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;
@@ -951,7 +950,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 :

services/usage/java/com/android/server/usage/StorageStatsService.java

+15 −17
Original line number Diff line number Diff line
@@ -968,7 +968,6 @@ public class StorageStatsService extends IStorageStatsManager.Stub { 
        stats.libSize += getDirBytes(new File(sourceDirName + "/lib/"));



        // Get dexopt, current profle and reference profile sizes.

        if (SystemProperties.getBoolean("dalvik.vm.features.art_managed_file_stats", false)) {

        ArtManagedFileStats artManagedFileStats;

        try (var snapshot = getPackageManagerLocal().withFilteredSnapshot()) {

            artManagedFileStats =
@@ -986,4 +985,3 @@ public class StorageStatsService extends IStorageStatsManager.Stub { 
                .getTotalSizeBytesByType(ArtManagedFileStats.TYPE_CUR_PROFILE);

    }

}
 
}