Merge "Removes ASEC-related logic from the framework" (dbbcf07e) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -2046,8 +2046,6 @@ public class ApplicationPackageManager extends PackageManager {
		StorageManager storage) {
		if (app.isInternal()) {
		return storage.findVolumeById(VolumeInfo.ID_PRIVATE_INTERNAL);
		} else if (app.isExternalAsec()) {
		return storage.getPrimaryPhysicalVolume();
		} else {
		return storage.findVolumeByUuid(app.volumeUuid);
		}

core/java/android/content/pm/ApplicationInfo.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.UserHandle;
		import android.os.storage.StorageManager;
		import android.text.TextUtils;
		import android.util.Printer;
		import android.util.SparseArray;
		import android.util.proto.ProtoOutputStream;
		@@ -463,16 +462,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int PRIVATE_FLAG_CANT_SAVE_STATE = 1<<1;

		/**
		* Value for {@link #privateFlags}: Set to true if the application has been
		* installed using the forward lock option.
		*
		* NOTE: DO NOT CHANGE THIS VALUE! It is saved in packages.xml.
		*
		* {@hide}
		*/
		public static final int PRIVATE_FLAG_FORWARD_LOCK = 1<<2;

		/**
		* Value for {@link #privateFlags}: set to {@code true} if the application
		* is permitted to hold privileged permissions.
		@@ -651,7 +640,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		PRIVATE_FLAG_CANT_SAVE_STATE,
		PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE,
		PRIVATE_FLAG_DIRECT_BOOT_AWARE,
		PRIVATE_FLAG_FORWARD_LOCK,
		PRIVATE_FLAG_HAS_DOMAIN_URLS,
		PRIVATE_FLAG_HIDDEN,
		PRIVATE_FLAG_INSTANT,
		@@ -1843,17 +1831,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		return (flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
		}

		/** @hide */
		public boolean isExternalAsec() {
		return TextUtils.isEmpty(volumeUuid) && isExternal();
		}

		/** @hide */
		@UnsupportedAppUsage
		public boolean isForwardLocked() {
		return (privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) != 0;
		}

		/**
		* True if the application is installed as an instant app.
		* @hide

core/java/android/content/pm/PackageInstaller.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -1373,12 +1373,6 @@ public class PackageInstaller {
		this.grantedRuntimePermissions = permissions;
		}

		/** {@hide} */
		public void setInstallFlagsInternal() {
		installFlags \|= PackageManager.INSTALL_INTERNAL;
		installFlags &= ~PackageManager.INSTALL_EXTERNAL;
		}

		/** {@hide} */
		@SystemApi
		public void setAllowDowngrade(boolean allowDowngrade) {
		@@ -1389,12 +1383,6 @@ public class PackageInstaller {
		}
		}

		/** {@hide} */
		public void setInstallFlagsExternal() {
		installFlags \|= PackageManager.INSTALL_EXTERNAL;
		installFlags &= ~PackageManager.INSTALL_INTERNAL;
		}

		/** {@hide} */
		public void setInstallFlagsForcePermissionPrompt() {
		installFlags \|= PackageManager.INSTALL_FORCE_PERMISSION_PROMPT;

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

+0 −32

Original line number	Diff line number	Diff line
		@@ -700,10 +700,8 @@ public abstract class PackageManager {

		/** @hide */
		@IntDef(flag = true, prefix = { "INSTALL_" }, value = {
		INSTALL_FORWARD_LOCK,
		INSTALL_REPLACE_EXISTING,
		INSTALL_ALLOW_TEST,
		INSTALL_EXTERNAL,
		INSTALL_INTERNAL,
		INSTALL_FROM_ADB,
		INSTALL_ALL_USERS,
		@@ -720,17 +718,6 @@ public abstract class PackageManager {
		@Retention(RetentionPolicy.SOURCE)
		public @interface InstallFlags {}

		/**
		* Flag parameter for {@link #installPackage} to indicate that this package
		* should be installed as forward locked, i.e. only the app itself should
		* have access to its code and non-resource assets.
		*
		* @deprecated new installs into ASEC containers are no longer supported.
		* @hide
		*/
		@Deprecated
		public static final int INSTALL_FORWARD_LOCK = 0x00000001;

		/**
		* Flag parameter for {@link #installPackage} to indicate that you want to
		* replace an already installed package, if one exists.
		@@ -748,17 +735,6 @@ public abstract class PackageManager {
		*/
		public static final int INSTALL_ALLOW_TEST = 0x00000004;

		/**
		* Flag parameter for {@link #installPackage} to indicate that this package
		* must be installed to an ASEC on a {@link VolumeInfo#TYPE_PUBLIC}.
		*
		* @deprecated new installs into ASEC containers are no longer supported;
		* use adoptable storage instead.
		* @hide
		*/
		@Deprecated
		public static final int INSTALL_EXTERNAL = 0x00000008;

		/**
		* Flag parameter for {@link #installPackage} to indicate that this package
		* must be installed to internal storage.
		@@ -1519,14 +1495,6 @@ public abstract class PackageManager {
		*/
		public static final int MOVE_FAILED_SYSTEM_PACKAGE = -3;

		/**
		* Error code that is passed to the {@link IPackageMoveObserver} if the
		* specified package cannot be moved since its forward locked.
		*
		* @hide
		*/
		public static final int MOVE_FAILED_FORWARD_LOCKED = -4;

		/**
		* Error code that is passed to the {@link IPackageMoveObserver} if the
		* specified package cannot be moved to the specified location.

core/java/android/content/pm/PackageParser.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -829,9 +829,6 @@ public class PackageParser {

		public static final int PARSE_MUST_BE_APK = 1 << 0;
		public static final int PARSE_IGNORE_PROCESSES = 1 << 1;
		/** @deprecated forward lock no longer functional. remove. */
		@Deprecated
		public static final int PARSE_FORWARD_LOCK = 1 << 2;
		public static final int PARSE_EXTERNAL_STORAGE = 1 << 3;
		public static final int PARSE_IS_SYSTEM_DIR = 1 << 4;
		public static final int PARSE_COLLECT_CERTIFICATES = 1 << 5;
		@@ -845,7 +842,6 @@ public class PackageParser {
		PARSE_ENFORCE_CODE,
		PARSE_EXTERNAL_STORAGE,
		PARSE_FORCE_SDK,
		PARSE_FORWARD_LOCK,
		PARSE_IGNORE_PROCESSES,
		PARSE_IS_SYSTEM_DIR,
		PARSE_MUST_BE_APK,
		@@ -2006,11 +2002,6 @@ public class PackageParser {
		PARSE_DEFAULT_TARGET_SANDBOX);
		pkg.applicationInfo.targetSandboxVersion = targetSandboxVersion;

		/* Set the global "forward lock" flag */
		if ((flags & PARSE_FORWARD_LOCK) != 0) {
		pkg.applicationInfo.privateFlags \|= ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK;
		}

		/* Set the global "on SD card" flag */
		if ((flags & PARSE_EXTERNAL_STORAGE) != 0) {
		pkg.applicationInfo.flags \|= ApplicationInfo.FLAG_EXTERNAL_STORAGE;
		@@ -6779,7 +6770,7 @@ public class PackageParser {

		/** @hide */
		public boolean isForwardLocked() {
		return applicationInfo.isForwardLocked();
		return false;
		}

		/** @hide */
		@@ -6821,9 +6812,7 @@ public class PackageParser {
		public boolean canHaveOatDir() {
		// The following app types CANNOT have oat directory
		// - non-updated system apps
		// - forward-locked apps or apps installed in ASEC containers
		return (!isSystem() \|\| isUpdatedSystemApp())
		&& !isForwardLocked() && !applicationInfo.isExternalAsec();
		return !isSystem() \|\| isUpdatedSystemApp();
		}

		public boolean isMatch(int flags) {