Merge "Revert "Add the "--ignore-dexopt-profile" option."" into main (f7500251) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageManager.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -1480,7 +1480,6 @@ public abstract class PackageManager {
		INSTALL_ALLOW_DOWNGRADE,
		INSTALL_STAGED,
		INSTALL_REQUEST_UPDATE_OWNERSHIP,
		INSTALL_IGNORE_DEXOPT_PROFILE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface InstallFlags {}
		@@ -1712,18 +1711,6 @@ public abstract class PackageManager {
		*/
		public static final int INSTALL_ARCHIVED = 1 << 27;

		/**
		* If set, all dexopt profiles are ignored by dexopt during the installation, including the
		* profile in the DM file and the profile embedded in the APK file. If an invalid profile is
		* provided during installation, no warning will be reported by {@code adb install}.
		*
		* This option does not affect later dexopt operations (e.g., background dexopt and manual `pm
		* compile` invocations).
		*
		* @hide
		*/
		public static final int INSTALL_IGNORE_DEXOPT_PROFILE = 1 << 28;

		/**
		* Flag parameter for {@link #installPackage} to force a non-staged update of an APEX. This is
		* a development-only feature and should not be used on end user devices.

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

+2 −11

Original line number	Diff line number	Diff line
		@@ -113,7 +113,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;
		@@ -162,7 +161,6 @@ import com.android.internal.util.CollectionUtils;
		import com.android.server.EventLogTags;
		import com.android.server.LocalManagerRegistry;
		import com.android.server.SystemConfig;
		import com.android.server.art.model.ArtFlags;
		import com.android.server.art.model.DexoptParams;
		import com.android.server.art.model.DexoptResult;
		import com.android.server.pm.Installer.LegacyDexoptDisabledException;
		@@ -2564,15 +2562,8 @@ final class InstallPackageHelper {
		LocalManagerRegistry.getManager(PackageManagerLocal.class);
		try (PackageManagerLocal.FilteredSnapshot snapshot =
		packageManagerLocal.withFilteredSnapshot()) {
		boolean ignoreDexoptProfile =
		(installRequest.getInstallFlags()
		& PackageManager.INSTALL_IGNORE_DEXOPT_PROFILE)
		!= 0;
		/@DexoptFlags/ int extraFlags =
		ignoreDexoptProfile && Flags.useArtServiceV2()
		? ArtFlags.FLAG_IGNORE_PROFILE
		: 0;
		DexoptParams params = dexoptOptions.convertToDexoptParams(extraFlags);
		DexoptParams params =
		dexoptOptions.convertToDexoptParams(0 /* extraFlags */);
		DexoptResult dexOptResult = DexOptHelper.getArtManagerLocal().dexoptPackage(
		snapshot, packageName, params);
		installRequest.onDexoptFinished(dexOptResult);

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -3703,9 +3703,6 @@ class PackageManagerShellCommand extends ShellCommand {
		sessionParams.installFlags \|=
		PackageManager.INSTALL_BYPASS_LOW_TARGET_SDK_BLOCK;
		break;
		case "--ignore-dexopt-profile":
		sessionParams.installFlags \|= PackageManager.INSTALL_IGNORE_DEXOPT_PROFILE;
		break;
		default:
		throw new IllegalArgumentException("Unknown option " + opt);
		}
		@@ -4802,7 +4799,7 @@ class PackageManagerShellCommand extends ShellCommand {
		pw.println(" [--enable-rollback]");
		pw.println(" [--force-uuid internal\|UUID] [--pkg PACKAGE] [-S BYTES]");
		pw.println(" [--apex] [--non-staged] [--force-non-staged]");
		pw.println(" [--staged-ready-timeout TIMEOUT] [--ignore-dexopt-profile]");
		pw.println(" [--staged-ready-timeout TIMEOUT]");
		pw.println(" [PATH [SPLIT...]\|-]");
		pw.println(" Install an application. Must provide the apk data to install, either as");
		pw.println(" file path(s) or '-' to read from stdin. Options are:");
		@@ -4842,13 +4839,6 @@ class PackageManagerShellCommand extends ShellCommand {
		pw.println(" milliseconds for pre-reboot verification to complete when");
		pw.println(" performing staged install. This flag is used to alter the waiting");
		pw.println(" time. You can skip the waiting time by specifying a TIMEOUT of '0'");
		pw.println(" --ignore-dexopt-profile: If set, all profiles are ignored by dexopt");
		pw.println(" during the installation, including the profile in the DM file and");
		pw.println(" the profile embedded in the APK file. If an invalid profile is");
		pw.println(" provided during installation, no warning will be reported by `adb");
		pw.println(" install`.");
		pw.println(" This option does not affect later dexopt operations (e.g.,");
		pw.println(" background dexopt and manual `pm compile` invocations).");
		pw.println("");
		pw.println(" install-existing [--user USER_ID\|all\|current]");
		pw.println(" [--instant] [--full] [--wait] [--restrict-permissions] PACKAGE");