Merge "Customer API feedback." into sc-dev (915f8bda) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -881,7 +881,7 @@ public class ApplicationPackageManager extends PackageManager {

		@Override
		public void requestChecksums(@NonNull String packageName, boolean includeSplits,
		@Checksum.Type int required, @NonNull List<Certificate> trustedInstallers,
		@Checksum.TypeMask int required, @NonNull List<Certificate> trustedInstallers,
		@NonNull OnChecksumsReadyListener onChecksumsReadyListener)
		throws CertificateEncodingException, NameNotFoundException {
		Objects.requireNonNull(packageName);

core/java/android/content/pm/ApkChecksum.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public final class ApkChecksum implements Parcelable {



		// Code below generated by codegen v1.0.15.
		// Code below generated by codegen v1.0.23.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		@@ -235,8 +235,8 @@ public final class ApkChecksum implements Parcelable {
		};

		@DataClass.Generated(
		time = 1601589269293L,
		codegenVersion = "1.0.15",
		time = 1619810171079L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/content/pm/ApkChecksum.java",
		inputSignatures = "private final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.NonNull android.content.pm.Checksum mChecksum\nprivate final @android.annotation.Nullable java.lang.String mInstallerPackageName\nprivate final @android.annotation.Nullable byte[] mInstallerCertificate\npublic @android.content.pm.Checksum.Type int getType()\npublic @android.annotation.NonNull byte[] getValue()\npublic @android.annotation.Nullable byte[] getInstallerCertificateBytes()\npublic @android.annotation.Nullable java.security.cert.Certificate getInstallerCertificate()\nclass ApkChecksum extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true)")
		@Deprecated

core/java/android/content/pm/Checksum.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ public final class Checksum implements Parcelable {
		public static final int TYPE_PARTIAL_MERKLE_ROOT_1M_SHA512 = 0x00000040;

		/** @hide */
		@IntDef(flag = true, prefix = {"TYPE_"}, value = {
		@IntDef(prefix = {"TYPE_"}, value = {
		TYPE_WHOLE_MERKLE_ROOT_4K_SHA256,
		TYPE_WHOLE_MD5,
		TYPE_WHOLE_SHA1,
		@@ -125,6 +125,19 @@ public final class Checksum implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface Type {}

		/** @hide */
		@IntDef(flag = true, prefix = {"TYPE_"}, value = {
		TYPE_WHOLE_MERKLE_ROOT_4K_SHA256,
		TYPE_WHOLE_MD5,
		TYPE_WHOLE_SHA1,
		TYPE_WHOLE_SHA256,
		TYPE_WHOLE_SHA512,
		TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256,
		TYPE_PARTIAL_MERKLE_ROOT_1M_SHA512,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface TypeMask {}

		/**
		* Serialize checksum to the stream in binary format.
		* @hide
		@@ -163,7 +176,7 @@ public final class Checksum implements Parcelable {



		// Code below generated by codegen v1.0.22.
		// Code below generated by codegen v1.0.23.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		@@ -263,8 +276,8 @@ public final class Checksum implements Parcelable {
		};

		@DataClass.Generated(
		time = 1611601571576L,
		codegenVersion = "1.0.22",
		time = 1619810358402L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/content/pm/Checksum.java",
		inputSignatures = "public static final int TYPE_WHOLE_MERKLE_ROOT_4K_SHA256\npublic static final @java.lang.Deprecated int TYPE_WHOLE_MD5\npublic static final @java.lang.Deprecated int TYPE_WHOLE_SHA1\npublic static final @java.lang.Deprecated int TYPE_WHOLE_SHA256\npublic static final @java.lang.Deprecated int TYPE_WHOLE_SHA512\npublic static final int TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256\npublic static final int TYPE_PARTIAL_MERKLE_ROOT_1M_SHA512\nprivate final @android.content.pm.Checksum.Type int mType\nprivate final @android.annotation.NonNull byte[] mValue\npublic static void writeToStream(java.io.DataOutputStream,android.content.pm.Checksum)\npublic static @android.annotation.NonNull android.content.pm.Checksum readFromStream(java.io.DataInputStream)\nclass Checksum extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstDefs=false)")
		@Deprecated

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -8711,7 +8711,7 @@ public abstract class PackageManager {
		* @throws NameNotFoundException if a package with the given name cannot be found on the system.
		*/
		public void requestChecksums(@NonNull String packageName, boolean includeSplits,
		@Checksum.Type int required, @NonNull List<Certificate> trustedInstallers,
		@Checksum.TypeMask int required, @NonNull List<Certificate> trustedInstallers,
		@NonNull OnChecksumsReadyListener onChecksumsReadyListener)
		throws CertificateEncodingException, NameNotFoundException {
		throw new UnsupportedOperationException("requestChecksums not implemented in subclass");

services/core/java/android/content/pm/PackageManagerInternal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1133,7 +1133,7 @@ public abstract class PackageManagerInternal implements PackageSettingsSnapshotP
		* @param handler to use for postponed calculations.
		*/
		public abstract void requestChecksums(@NonNull String packageName, boolean includeSplits,
		@Checksum.Type int optional, @Checksum.Type int required,
		@Checksum.TypeMask int optional, @Checksum.TypeMask int required,
		@Nullable List trustedInstallers,
		@NonNull IOnChecksumsReadyListener onChecksumsReadyListener, int userId,
		@NonNull Executor executor, @NonNull Handler handler);