Merge "Cleanup flags." into main (120b0862) · Commits · e / os / android_frameworks_base

core/api/current.txt

+8 −8

Original line number	Diff line number	Diff line
		@@ -13630,7 +13630,7 @@ package android.content.pm {
		method @NonNull public abstract android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(@NonNull android.graphics.drawable.Drawable, @NonNull android.os.UserHandle, @Nullable android.graphics.Rect, int);
		method @NonNull public abstract android.graphics.drawable.Drawable getUserBadgedIcon(@NonNull android.graphics.drawable.Drawable, @NonNull android.os.UserHandle);
		method @NonNull public abstract CharSequence getUserBadgedLabel(@NonNull CharSequence, @NonNull android.os.UserHandle);
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") @NonNull public static android.content.pm.SigningInfo getVerifiedSigningInfo(@NonNull String, int) throws android.content.pm.SigningInfoException;
		method @NonNull public static android.content.pm.SigningInfo getVerifiedSigningInfo(@NonNull String, int) throws android.content.pm.SigningInfoException;
		method @NonNull @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public java.util.Set<java.lang.String> getWhitelistedRestrictedPermissions(@NonNull String, int);
		method @Nullable public abstract android.content.res.XmlResourceParser getXml(@NonNull String, @XmlRes int, @Nullable android.content.pm.ApplicationInfo);
		method public boolean hasSigningCertificate(@NonNull String, @NonNull byte[], int);
		@@ -14276,17 +14276,17 @@ package android.content.pm {
		method public android.content.pm.Signature[] getSigningCertificateHistory();
		method public boolean hasMultipleSigners();
		method public boolean hasPastSigningCertificates();
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public boolean signersMatchExactly(@NonNull android.content.pm.SigningInfo);
		method public boolean signersMatchExactly(@NonNull android.content.pm.SigningInfo);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.SigningInfo> CREATOR;
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_JAR = 1; // 0x1
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V2 = 2; // 0x2
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V3 = 3; // 0x3
		field @FlaggedApi("android.content.pm.cloud_compilation_pm") public static final int VERSION_SIGNING_BLOCK_V4 = 4; // 0x4
		field public static final int VERSION_JAR = 1; // 0x1
		field public static final int VERSION_SIGNING_BLOCK_V2 = 2; // 0x2
		field public static final int VERSION_SIGNING_BLOCK_V3 = 3; // 0x3
		field public static final int VERSION_SIGNING_BLOCK_V4 = 4; // 0x4
		}

		@FlaggedApi("android.content.pm.cloud_compilation_pm") public class SigningInfoException extends java.lang.Exception {
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public int getCode();
		public class SigningInfoException extends java.lang.Exception {
		method public int getCode();
		}

		public final class VersionedPackage implements android.os.Parcelable {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -12125,7 +12125,6 @@ public abstract class PackageManager {
		*
		* @throws SigningInfoException if the verification fails
		*/
		@FlaggedApi(android.content.pm.Flags.FLAG_CLOUD_COMPILATION_PM)
		public static @NonNull SigningInfo getVerifiedSigningInfo(@NonNull String path,
		@AppSigningSchemeVersion int minAppSigningSchemeVersion) throws SigningInfoException {
		ParseTypeImpl input = ParseTypeImpl.forDefaultParsing();

core/java/android/content/pm/SigningInfo.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -40,28 +40,24 @@ public final class SigningInfo implements Parcelable {
		* JAR signing (v1 scheme).
		* See https://source.android.com/docs/security/features/apksigning#v1.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public static final int VERSION_JAR = SignatureSchemeVersion.JAR;

		/**
		* APK signature scheme v2.
		* See https://source.android.com/docs/security/features/apksigning/v2.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public static final int VERSION_SIGNING_BLOCK_V2 = SignatureSchemeVersion.SIGNING_BLOCK_V2;

		/**
		* APK signature scheme v3.
		* See https://source.android.com/docs/security/features/apksigning/v3.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public static final int VERSION_SIGNING_BLOCK_V3 = SignatureSchemeVersion.SIGNING_BLOCK_V3;

		/**
		* APK signature scheme v4.
		* See https://source.android.com/docs/security/features/apksigning/v4.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public static final int VERSION_SIGNING_BLOCK_V4 = SignatureSchemeVersion.SIGNING_BLOCK_V4;

		/** @hide */
		@@ -243,7 +239,6 @@ public final class SigningInfo implements Parcelable {
		/**
		* Returns true if the signing certificates in this and other match exactly.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public boolean signersMatchExactly(@NonNull SigningInfo other) {
		return mSigningDetails.signaturesMatchExactly(other.mSigningDetails);
		}

core/java/android/content/pm/SigningInfoException.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.content.pm;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.Nullable;

		@@ -25,7 +24,6 @@ import android.annotation.Nullable;
		* <a href="https://source.android.com/docs/security/features/apksigning">app signing</a>
		* information.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public class SigningInfoException extends Exception {
		private final int mCode;

		@@ -39,7 +37,6 @@ public class SigningInfoException extends Exception {
		* Returns a code representing the cause, in one of the installation parse return codes in
		* {@link PackageManager}.
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		public int getCode() {
		return mCode;
		}

core/java/android/content/pm/flags.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -310,14 +310,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "cloud_compilation_verification"
		namespace: "art_mainline"
		description: "Feature flag to enable the Cloud Compilation install-time verification in the package manager."
		bug: "377474232"
		is_fixed_read_only: true
		}

		flag {
		name: "parallel_package_parsing_across_system_dirs"
		namespace: "system_performance"