Merge "Make getVerifiedSigningInfo public." into main am: 3c4e070dff am: 196b56fd7b (0881399c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -13380,6 +13380,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 @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);
		@@ -14025,8 +14026,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 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
		}

		@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 final class VersionedPackage implements android.os.Parcelable {

core/api/module-lib-current.txt

+0 −13

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ package android.content.pm {

		public abstract class PackageManager {
		method @NonNull public String getSdkSandboxPackageName();
		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 @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int);
		field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH";
		field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000
		@@ -141,18 +140,6 @@ package android.content.pm {
		method @NonNull public String getPackageName();
		}

		public final class SigningInfo implements android.os.Parcelable {
		method @FlaggedApi("android.content.pm.cloud_compilation_pm") public boolean signersMatchExactly(@NonNull android.content.pm.SigningInfo);
		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
		}

		@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();
		}

		}

		package android.hardware.usb {

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -12023,11 +12023,8 @@ public abstract class PackageManager {
		* file.
		*
		* @throws SigningInfoException if the verification fails
		*
		* @hide
		*/
		@FlaggedApi(android.content.pm.Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		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 −16

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.content.pm.SigningDetails.SignatureSchemeVersion;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -40,41 +39,29 @@ public final class SigningInfo implements Parcelable {
		/**
		* JAR signing (v1 scheme).
		* See https://source.android.com/docs/security/features/apksigning#v1.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final int VERSION_JAR = SignatureSchemeVersion.JAR;

		/**
		* APK signature scheme v2.
		* See https://source.android.com/docs/security/features/apksigning/v2.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		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.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		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.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final int VERSION_SIGNING_BLOCK_V4 = SignatureSchemeVersion.SIGNING_BLOCK_V4;

		/** @hide */
		@@ -255,11 +242,8 @@ public final class SigningInfo implements Parcelable {

		/**
		* Returns true if the signing certificates in this and other match exactly.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public boolean signersMatchExactly(@NonNull SigningInfo other) {
		return mSigningDetails.signaturesMatchExactly(other.mSigningDetails);
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,17 +19,13 @@ package android.content.pm;
		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;

		/**
		* Indicates an error when verifying the
		* <a href="https://source.android.com/docs/security/features/apksigning">app signing</a>
		* information.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CLOUD_COMPILATION_PM)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public class SigningInfoException extends Exception {
		private final int mCode;