Merge "Revert "Digest API: allow installer to provide digests for an APK."" (a3d1d145) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −26

Original line number	Diff line number	Diff line
		@@ -11447,16 +11447,6 @@ package android.content.pm {
		field public final float widthFraction;
		}

		public final class ApkChecksum implements android.os.Parcelable {
		method public int describeContents();
		method public int getKind();
		method @Nullable public java.security.cert.Certificate getSourceCertificate() throws java.security.cert.CertificateException;
		method @Nullable public String getSplitName();
		method @NonNull public byte[] getValue();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.ApkChecksum> CREATOR;
		}

		public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		ctor public ApplicationInfo();
		ctor public ApplicationInfo(android.content.pm.ApplicationInfo);
		@@ -11558,21 +11548,6 @@ package android.content.pm {
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.ChangedPackages> CREATOR;
		}

		public final class Checksum implements android.os.Parcelable {
		method public int describeContents();
		method public int getKind();
		method @NonNull public byte[] getValue();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.Checksum> CREATOR;
		field public static final int PARTIAL_MERKLE_ROOT_1M_SHA256 = 32; // 0x20
		field public static final int PARTIAL_MERKLE_ROOT_1M_SHA512 = 64; // 0x40
		field public static final int WHOLE_MD5 = 2; // 0x2
		field public static final int WHOLE_MERKLE_ROOT_4K_SHA256 = 1; // 0x1
		field public static final int WHOLE_SHA1 = 4; // 0x4
		field public static final int WHOLE_SHA256 = 8; // 0x8
		field public static final int WHOLE_SHA512 = 16; // 0x10
		}

		public class ComponentInfo extends android.content.pm.PackageItemInfo {
		ctor public ComponentInfo();
		ctor public ComponentInfo(android.content.pm.ComponentInfo);
		@@ -11644,6 +11619,16 @@ package android.content.pm {
		field public int version;
		}

		public final class FileChecksum implements android.os.Parcelable {
		method public int describeContents();
		method public int getKind();
		method @Nullable public java.security.cert.Certificate getSourceCertificate() throws java.security.cert.CertificateException;
		method @Nullable public String getSplitName();
		method @NonNull public byte[] getValue();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.FileChecksum> CREATOR;
		}

		public final class InstallSourceInfo implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String getInitiatingPackageName();
		@@ -11864,7 +11849,6 @@ package android.content.pm {

		public static class PackageInstaller.Session implements java.io.Closeable {
		method public void abandon();
		method public void addChecksums(@NonNull String, @NonNull java.util.List<android.content.pm.Checksum>) throws java.io.IOException;
		method public void addChildSessionId(int);
		method public void close();
		method public void commit(@NonNull android.content.IntentSender);
		@@ -12266,6 +12250,8 @@ package android.content.pm {
		field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
		field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
		field public static final int PARTIAL_MERKLE_ROOT_1M_SHA256 = 32; // 0x20
		field public static final int PARTIAL_MERKLE_ROOT_1M_SHA512 = 64; // 0x40
		field public static final int PERMISSION_DENIED = -1; // 0xffffffff
		field public static final int PERMISSION_GRANTED = 0; // 0x0
		field public static final int SIGNATURE_FIRST_NOT_SIGNED = -1; // 0xffffffff
		@@ -12280,6 +12266,11 @@ package android.content.pm {
		field public static final int VERIFICATION_ALLOW = 1; // 0x1
		field public static final int VERIFICATION_REJECT = -1; // 0xffffffff
		field public static final int VERSION_CODE_HIGHEST = -1; // 0xffffffff
		field public static final int WHOLE_MD5 = 2; // 0x2
		field public static final int WHOLE_MERKLE_ROOT_4K_SHA256 = 1; // 0x1
		field public static final int WHOLE_SHA1 = 4; // 0x4
		field public static final int WHOLE_SHA256 = 8; // 0x8
		field public static final int WHOLE_SHA512 = 16; // 0x10
		}

		public static class PackageManager.NameNotFoundException extends android.util.AndroidException {

core/java/android/app/ApplicationPackageManager.java

+1 −10

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

		package android.app;

		import static android.content.pm.Checksum.PARTIAL_MERKLE_ROOT_1M_SHA256;
		import static android.content.pm.Checksum.PARTIAL_MERKLE_ROOT_1M_SHA512;
		import static android.content.pm.Checksum.WHOLE_MD5;
		import static android.content.pm.Checksum.WHOLE_MERKLE_ROOT_4K_SHA256;
		import static android.content.pm.Checksum.WHOLE_SHA1;
		import static android.content.pm.Checksum.WHOLE_SHA256;
		import static android.content.pm.Checksum.WHOLE_SHA512;

		import android.annotation.DrawableRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -40,7 +32,6 @@ import android.content.IntentSender;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.ChangedPackages;
		import android.content.pm.Checksum;
		import android.content.pm.ComponentInfo;
		import android.content.pm.FeatureInfo;
		import android.content.pm.IPackageDataObserver;
		@@ -982,7 +973,7 @@ public class ApplicationPackageManager extends PackageManager {

		@Override
		public void getChecksums(@NonNull String packageName, boolean includeSplits,
		@Checksum.Kind int required, @Nullable List<Certificate> trustedInstallers,
		@FileChecksumKind int required, @Nullable List<Certificate> trustedInstallers,
		@NonNull IntentSender statusReceiver)
		throws CertificateEncodingException, IOException, NameNotFoundException {
		Objects.requireNonNull(packageName);

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

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.content.pm;

		parcelable Checksum;

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

deleted100644 → 0

+0 −228

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.content.pm;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.util.DataClass;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.List;

		/**
		* A typed checksum.
		*
		* @see PackageInstaller.Session#addChecksums(String, List)
		*/
		@DataClass(genHiddenConstructor = true, genConstDefs = false)
		public final class Checksum implements Parcelable {
		/**
		* Root SHA256 hash of a 4K Merkle tree computed over all file bytes.
		* <a href="https://source.android.com/security/apksigning/v4">See APK Signature Scheme V4</a>.
		* <a href="https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git/tree/Documentation/filesystems/fsverity.rst">See fs-verity</a>.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int WHOLE_MERKLE_ROOT_4K_SHA256 = 0x00000001;

		/**
		* MD5 hash computed over all file bytes.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int WHOLE_MD5 = 0x00000002;

		/**
		* SHA1 hash computed over all file bytes.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int WHOLE_SHA1 = 0x00000004;

		/**
		* SHA256 hash computed over all file bytes.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int WHOLE_SHA256 = 0x00000008;

		/**
		* SHA512 hash computed over all file bytes.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int WHOLE_SHA512 = 0x00000010;

		/**
		* Root SHA256 hash of a 1M Merkle tree computed over protected content.
		* Excludes signing block.
		* <a href="https://source.android.com/security/apksigning/v2">See APK Signature Scheme V2</a>.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int PARTIAL_MERKLE_ROOT_1M_SHA256 = 0x00000020;

		/**
		* Root SHA512 hash of a 1M Merkle tree computed over protected content.
		* Excludes signing block.
		* <a href="https://source.android.com/security/apksigning/v2">See APK Signature Scheme V2</a>.
		*
		* @see PackageManager#getChecksums
		*/
		public static final int PARTIAL_MERKLE_ROOT_1M_SHA512 = 0x00000040;

		/** @hide */
		@IntDef(flag = true, prefix = {"WHOLE_", "PARTIAL_"}, value = {
		WHOLE_MERKLE_ROOT_4K_SHA256,
		WHOLE_MD5,
		WHOLE_SHA1,
		WHOLE_SHA256,
		WHOLE_SHA512,
		PARTIAL_MERKLE_ROOT_1M_SHA256,
		PARTIAL_MERKLE_ROOT_1M_SHA512,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Kind {}

		/**
		* Checksum kind.
		*/
		private final @Checksum.Kind int mKind;
		/**
		* Checksum value.
		*/
		private final @NonNull byte[] mValue;



		// Code below generated by codegen v1.0.15.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/Checksum.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		/**
		* Creates a new Checksum.
		*
		* @param kind
		* Checksum kind.
		* @param value
		* Checksum value.
		* @hide
		*/
		@DataClass.Generated.Member
		public Checksum(
		@Checksum.Kind int kind,
		@NonNull byte[] value) {
		this.mKind = kind;
		com.android.internal.util.AnnotationValidations.validate(
		Checksum.Kind.class, null, mKind);
		this.mValue = value;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mValue);

		// onConstructed(); // You can define this method to get a callback
		}

		/**
		* Checksum kind.
		*/
		@DataClass.Generated.Member
		public @Checksum.Kind int getKind() {
		return mKind;
		}

		/**
		* Checksum value.
		*/
		@DataClass.Generated.Member
		public @NonNull byte[] getValue() {
		return mValue;
		}

		@Override
		@DataClass.Generated.Member
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		dest.writeInt(mKind);
		dest.writeByteArray(mValue);
		}

		@Override
		@DataClass.Generated.Member
		public int describeContents() { return 0; }

		/** @hide */
		@SuppressWarnings({"unchecked", "RedundantCast"})
		@DataClass.Generated.Member
		/* package-private */ Checksum(@NonNull Parcel in) {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		int kind = in.readInt();
		byte[] value = in.createByteArray();

		this.mKind = kind;
		com.android.internal.util.AnnotationValidations.validate(
		Checksum.Kind.class, null, mKind);
		this.mValue = value;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mValue);

		// onConstructed(); // You can define this method to get a callback
		}

		@DataClass.Generated.Member
		public static final @NonNull Parcelable.Creator<Checksum> CREATOR
		= new Parcelable.Creator<Checksum>() {
		@Override
		public Checksum[] newArray(int size) {
		return new Checksum[size];
		}

		@Override
		public Checksum createFromParcel(@NonNull Parcel in) {
		return new Checksum(in);
		}
		};

		@DataClass.Generated(
		time = 1599845646883L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/content/pm/Checksum.java",
		inputSignatures = "public static final int WHOLE_MERKLE_ROOT_4K_SHA256\npublic static final int WHOLE_MD5\npublic static final int WHOLE_SHA1\npublic static final int WHOLE_SHA256\npublic static final int WHOLE_SHA512\npublic static final int PARTIAL_MERKLE_ROOT_1M_SHA256\npublic static final int PARTIAL_MERKLE_ROOT_1M_SHA512\nprivate final @android.content.pm.Checksum.Kind int mKind\nprivate final @android.annotation.NonNull byte[] mValue\nclass Checksum extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genConstDefs=false)")
		@Deprecated
		private void __metadata() {}


		//@formatter:on
		// End of generated code

		}

core/java/android/content/pm/ApkChecksum.aidl→core/java/android/content/pm/FileChecksum.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,5 +16,5 @@

		package android.content.pm;

		parcelable ApkChecksum;
		parcelable FileChecksum;