Merge "Hide integrity @IntDefs" (0bfdf247) · Commits · e / os / android_frameworks_base

api/system-current.txt

+9 −24

Original line number	Diff line number	Diff line
		@@ -1730,7 +1730,7 @@ package android.content.integrity {
		}

		public abstract class AtomicFormula implements android.content.integrity.Formula {
		ctor public AtomicFormula(@android.content.integrity.AtomicFormula.Key int);
		ctor public AtomicFormula(int);
		method public int getKey();
		field public static final int APP_CERTIFICATE = 1; // 0x1
		field public static final int EQ = 0; // 0x0
		@@ -1746,7 +1746,7 @@ package android.content.integrity {
		}

		public static final class AtomicFormula.BooleanAtomicFormula extends android.content.integrity.AtomicFormula implements android.os.Parcelable {
		ctor public AtomicFormula.BooleanAtomicFormula(@android.content.integrity.AtomicFormula.Key int, boolean);
		ctor public AtomicFormula.BooleanAtomicFormula(int, boolean);
		method public int describeContents();
		method public int getTag();
		method public boolean getValue();
		@@ -1756,7 +1756,7 @@ package android.content.integrity {
		}

		public static final class AtomicFormula.IntAtomicFormula extends android.content.integrity.AtomicFormula implements android.os.Parcelable {
		ctor public AtomicFormula.IntAtomicFormula(@android.content.integrity.AtomicFormula.Key int, @android.content.integrity.AtomicFormula.Operator int, int);
		ctor public AtomicFormula.IntAtomicFormula(int, int, int);
		method public int describeContents();
		method public int getOperator();
		method public int getTag();
		@@ -1766,14 +1766,8 @@ package android.content.integrity {
		field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.AtomicFormula.IntAtomicFormula> CREATOR;
		}

		@IntDef({android.content.integrity.AtomicFormula.PACKAGE_NAME, android.content.integrity.AtomicFormula.APP_CERTIFICATE, android.content.integrity.AtomicFormula.INSTALLER_NAME, android.content.integrity.AtomicFormula.INSTALLER_CERTIFICATE, android.content.integrity.AtomicFormula.VERSION_CODE, android.content.integrity.AtomicFormula.PRE_INSTALLED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface AtomicFormula.Key {
		}

		@IntDef({android.content.integrity.AtomicFormula.EQ, android.content.integrity.AtomicFormula.LT, android.content.integrity.AtomicFormula.LE, android.content.integrity.AtomicFormula.GT, android.content.integrity.AtomicFormula.GE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface AtomicFormula.Operator {
		}

		public static final class AtomicFormula.StringAtomicFormula extends android.content.integrity.AtomicFormula implements android.os.Parcelable {
		ctor public AtomicFormula.StringAtomicFormula(@android.content.integrity.AtomicFormula.Key int, @NonNull String, boolean);
		ctor public AtomicFormula.StringAtomicFormula(int, @NonNull String, boolean);
		method public int describeContents();
		method public boolean getIsHashedValue();
		method public int getTag();
		@@ -1784,9 +1778,9 @@ package android.content.integrity {
		}

		public final class CompoundFormula implements android.content.integrity.Formula android.os.Parcelable {
		ctor public CompoundFormula(@android.content.integrity.CompoundFormula.Connector int, @NonNull java.util.List<android.content.integrity.Formula>);
		ctor public CompoundFormula(int, @NonNull java.util.List<android.content.integrity.Formula>);
		method public int describeContents();
		method @android.content.integrity.CompoundFormula.Connector public int getConnector();
		method public int getConnector();
		method @NonNull public java.util.List<android.content.integrity.Formula> getFormulas();
		method public int getTag();
		method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata);
		@@ -1797,11 +1791,8 @@ package android.content.integrity {
		field public static final int OR = 1; // 0x1
		}

		@IntDef({android.content.integrity.CompoundFormula.AND, android.content.integrity.CompoundFormula.OR, android.content.integrity.CompoundFormula.NOT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface CompoundFormula.Connector {
		}

		public interface Formula {
		method @android.content.integrity.Formula.Tag public int getTag();
		method public int getTag();
		method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata);
		method @NonNull public static android.content.integrity.Formula readFromParcel(@NonNull android.os.Parcel);
		method public static void writeToParcel(@NonNull android.content.integrity.Formula, @NonNull android.os.Parcel, int);
		@@ -1811,13 +1802,10 @@ package android.content.integrity {
		field public static final int STRING_ATOMIC_FORMULA_TAG = 1; // 0x1
		}

		@IntDef({android.content.integrity.Formula.COMPOUND_FORMULA_TAG, android.content.integrity.Formula.STRING_ATOMIC_FORMULA_TAG, android.content.integrity.Formula.INT_ATOMIC_FORMULA_TAG, android.content.integrity.Formula.BOOLEAN_ATOMIC_FORMULA_TAG}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Formula.Tag {
		}

		public final class Rule implements android.os.Parcelable {
		ctor public Rule(@NonNull android.content.integrity.Formula, @android.content.integrity.Rule.Effect int);
		ctor public Rule(@NonNull android.content.integrity.Formula, int);
		method public int describeContents();
		method @android.content.integrity.Rule.Effect public int getEffect();
		method public int getEffect();
		method @NonNull public android.content.integrity.Formula getFormula();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.Rule> CREATOR;
		@@ -1825,9 +1813,6 @@ package android.content.integrity {
		field public static final int FORCE_ALLOW = 1; // 0x1
		}

		@IntDef({android.content.integrity.Rule.DENY, android.content.integrity.Rule.FORCE_ALLOW}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Rule.Effect {
		}

		public class RuleSet {
		method @NonNull public java.util.List<android.content.integrity.Rule> getRules();
		method @NonNull public String getVersion();

api/system-lint-baseline.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -196,17 +196,6 @@ ProtectedMember: android.service.contentcapture.ContentCaptureService#dump(java.
		ProtectedMember: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context):


		PublicTypedef: android.content.integrity.AtomicFormula.Key: Don't expose @IntDef: @Key must be hidden.

		PublicTypedef: android.content.integrity.AtomicFormula.Operator: Don't expose @IntDef: @Operator must be hidden.

		PublicTypedef: android.content.integrity.CompoundFormula.Connector: Don't expose @IntDef: @Connector must be hidden.

		PublicTypedef: android.content.integrity.Formula.Tag: Don't expose @IntDef: @Tag must be hidden.

		PublicTypedef: android.content.integrity.Rule.Effect: Don't expose @IntDef: @Effect must be hidden.


		SamShouldBeLast: android.accounts.AccountManager#addAccount(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler):

		SamShouldBeLast: android.accounts.AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean):

core/java/android/content/integrity/AtomicFormula.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ public abstract class AtomicFormula implements Formula {

		private static final String TAG = "AtomicFormula";

		/** @hide */
		@IntDef(
		value = {
		PACKAGE_NAME,
		@@ -56,6 +57,7 @@ public abstract class AtomicFormula implements Formula {
		@Retention(RetentionPolicy.SOURCE)
		public @interface Key {}

		/** @hide */
		@IntDef(value = {EQ, LT, LE, GT, GE})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Operator {}

core/java/android/content/integrity/CompoundFormula.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import java.util.Objects;
		public final class CompoundFormula implements Formula, Parcelable {
		private static final String TAG = "OpenFormula";

		/** @hide */
		@IntDef(
		value = {
		AND, OR, NOT,

core/java/android/content/integrity/Formula.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import java.lang.annotation.RetentionPolicy;
		@SystemApi
		@VisibleForTesting
		public interface Formula {
		/** @hide */
		@IntDef(
		value = {
		COMPOUND_FORMULA_TAG,