Merge "Revert "Prepare AttributionSource to expose to native"" into sc-dev (b9b8524f) · Commits · e / os / android_frameworks_base

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,6 @@ java_defaults {
		"tv_tuner_resource_manager_aidl_interface-java",
		"soundtrigger_middleware-aidl-java",
		"modules-utils-os",
		"framework-permission-aidl-java",
		],
		}

core/java/android/content/AttributionSource.java

+265 −120

Original line number	Diff line number	Diff line
		@@ -31,9 +31,10 @@ import android.permission.PermissionManager;
		import android.util.ArraySet;

		import com.android.internal.annotations.Immutable;
		import com.android.internal.util.CollectionUtils;
		import com.android.internal.util.DataClass;
		import com.android.internal.util.Parcelling;

		import java.util.Arrays;
		import java.util.Collections;
		import java.util.Objects;
		import java.util.Set;

		@@ -69,10 +70,10 @@ import java.util.Set;
		* This is supported to handle cases where you don't have access to the caller's attribution
		* source and you can directly use the {@link AttributionSource.Builder} APIs. However,
		* if the data flows through more than two apps (more than you access the data for the
		* caller) you need to have a handle to the {@link AttributionSource} for the calling app's
		* context in order to create an attribution context. This means you either need to have an
		* API for the other app to send you its attribution source or use a platform API that pipes
		* the callers attribution source.
		* caller - which you cannot know ahead of time) you need to have a handle to the {@link
		* AttributionSource} for the calling app's context in order to create an attribution context.
		* This means you either need to have an API for the other app to send you its attribution
		* source or use a platform API that pipes the callers attribution source.
		* <p>
		* You cannot forge an attribution chain without the participation of every app in the
		* attribution chain (aside of the special case mentioned above). To create an attribution
		@@ -84,11 +85,80 @@ import java.util.Set;
		* permission protected APIs since some app in the chain may not have the permission.
		*/
		@Immutable
		// TODO: Codegen doesn't properly verify the class if the parcelling is inner class
		// TODO: Codegen doesn't allow overriding the constructor to change its visibility
		// TODO: Codegen applies method level annotations to argument vs the generated member (@SystemApi)
		// TODO: Codegen doesn't properly read/write IBinder members
		// TODO: Codegen doesn't properly handle Set arguments
		// TODO: Codegen requires @SystemApi annotations on fields which breaks
		// android.signature.cts.api.AnnotationTest (need to update the test)
		// @DataClass(genEqualsHashCode = true, genConstructor = false, genBuilder = true)
		public final class AttributionSource implements Parcelable {
		private final @NonNull AttributionSourceState mAttributionSourceState;
		/**
		* @hide
		*/
		static class RenouncedPermissionsParcelling implements Parcelling<Set<String>> {

		@Override
		public void parcel(Set<String> item, Parcel dest, int parcelFlags) {
		if (item == null) {
		dest.writeInt(-1);
		} else {
		dest.writeInt(item.size());
		for (String permission : item) {
		dest.writeString8(permission);
		}
		}
		}

		@Override
		public Set<String> unparcel(Parcel source) {
		final int size = source.readInt();
		if (size < 0) {
		return null;
		}
		final ArraySet<String> result = new ArraySet<>(size);
		for (int i = 0; i < size; i++) {
		result.add(source.readString8());
		}
		return result;
		}
		}

		/**
		* The UID that is accessing the permission protected data.
		*/
		private final int mUid;

		/**
		* The package that is accessing the permission protected data.
		*/
		private @Nullable String mPackageName = null;

		private @Nullable AttributionSource mNextCached;
		private @Nullable Set<String> mRenouncedPermissionsCached;
		/**
		* The attribution tag of the app accessing the permission protected data.
		*/
		private @Nullable String mAttributionTag = null;

		/**
		* Unique token for that source.
		*
		* @hide
		*/
		private @Nullable IBinder mToken = null;

		/**
		* Permissions that should be considered revoked regardless if granted.
		*
		* @hide
		*/
		@DataClass.ParcelWith(RenouncedPermissionsParcelling.class)
		private @Nullable Set<String> mRenouncedPermissions = null;

		/**
		* The next app to receive the permission protected data.
		*/
		private @Nullable AttributionSource mNext = null;

		/** @hide */
		@TestApi
		@@ -101,7 +171,8 @@ public final class AttributionSource implements Parcelable {
		@TestApi
		public AttributionSource(int uid, @Nullable String packageName,
		@Nullable String attributionTag, @Nullable AttributionSource next) {
		this(uid, packageName, attributionTag, /renouncedPermissions/ null, next);
		this(uid, packageName, attributionTag, /token/ null,
		/renouncedPermissions/ null, next);
		}

		/** @hide */
		@@ -109,8 +180,8 @@ public final class AttributionSource implements Parcelable {
		public AttributionSource(int uid, @Nullable String packageName,
		@Nullable String attributionTag, @Nullable Set<String> renouncedPermissions,
		@Nullable AttributionSource next) {
		this(uid, packageName, attributionTag, /token/ null, (renouncedPermissions != null)
		? renouncedPermissions.toArray(new String[0]) : null, next);
		this(uid, packageName, attributionTag, /token/ null,
		renouncedPermissions, next);
		}

		/** @hide */
		@@ -120,49 +191,16 @@ public final class AttributionSource implements Parcelable {
		/token/ null, /renouncedPermissions/ null, next);
		}

		AttributionSource(int uid, @Nullable String packageName, @Nullable String attributionTag,
		@Nullable IBinder token, @Nullable String[] renouncedPermissions,
		@Nullable AttributionSource next) {
		mAttributionSourceState = new AttributionSourceState();
		mAttributionSourceState.uid = uid;
		mAttributionSourceState.packageName = packageName;
		mAttributionSourceState.attributionTag = attributionTag;
		mAttributionSourceState.token = token;
		mAttributionSourceState.renouncedPermissions = renouncedPermissions;
		mAttributionSourceState.next = (next != null) ? new AttributionSourceState[]
		{next.mAttributionSourceState} : null;
		}

		AttributionSource(@NonNull Parcel in) {
		this(AttributionSourceState.CREATOR.createFromParcel(in));
		}

		/** @hide */
		public AttributionSource(@NonNull AttributionSourceState attributionSourceState) {
		mAttributionSourceState = attributionSourceState;
		}

		/** @hide */
		public AttributionSource withNextAttributionSource(@Nullable AttributionSource next) {
		return new AttributionSource(getUid(), getPackageName(), getAttributionTag(),
		getToken(), mAttributionSourceState.renouncedPermissions, next);
		return new AttributionSource(mUid, mPackageName, mAttributionTag, mToken,
		mRenouncedPermissions, next);
		}

		/** @hide */
		public AttributionSource withToken(@Nullable IBinder token) {
		return new AttributionSource(getUid(), getPackageName(), getAttributionTag(),
		token, mAttributionSourceState.renouncedPermissions, getNext());
		}

		/** @hide */
		public AttributionSource withPackageName(@Nullable String packageName) {
		return new AttributionSource(getUid(), packageName, getAttributionTag(), getToken(),
		mAttributionSourceState.renouncedPermissions, getNext());
		}

		/** @hide */
		public @NonNull AttributionSourceState asState() {
		return mAttributionSourceState;
		return new AttributionSource(mUid, mPackageName, mAttributionTag, token,
		mRenouncedPermissions, mNext);
		}

		/**
		@@ -175,9 +213,10 @@ public final class AttributionSource implements Parcelable {
		* from the caller.
		*/
		public void enforceCallingUid() {
		if (!checkCallingUid()) {
		throw new SecurityException("Calling uid: " + Binder.getCallingUid()
		+ " doesn't match source uid: " + mAttributionSourceState.uid);
		final int callingUid = Binder.getCallingUid();
		if (callingUid != Process.SYSTEM_UID && callingUid != mUid) {
		throw new SecurityException("Calling uid: " + callingUid
		+ " doesn't match source uid: " + mUid);
		}
		// No need to check package as app ops manager does it already.
		}
		@@ -192,8 +231,7 @@ public final class AttributionSource implements Parcelable {
		*/
		public boolean checkCallingUid() {
		final int callingUid = Binder.getCallingUid();
		if (callingUid != Process.SYSTEM_UID
		&& callingUid != mAttributionSourceState.uid) {
		if (callingUid != Process.SYSTEM_UID && callingUid != mUid) {
		return false;
		}
		// No need to check package as app ops manager does it already.
		@@ -204,12 +242,11 @@ public final class AttributionSource implements Parcelable {
		public String toString() {
		if (Build.IS_DEBUGGABLE) {
		return "AttributionSource { " +
		"uid = " + mAttributionSourceState.uid + ", " +
		"packageName = " + mAttributionSourceState.packageName + ", " +
		"attributionTag = " + mAttributionSourceState.attributionTag + ", " +
		"token = " + mAttributionSourceState.token + ", " +
		"next = " + (mAttributionSourceState.next != null
		? mAttributionSourceState.next[0]: null) +
		"uid = " + mUid + ", " +
		"packageName = " + mPackageName + ", " +
		"attributionTag = " + mAttributionTag + ", " +
		"token = " + mToken + ", " +
		"next = " + mNext +
		" }";
		}
		return super.toString();
		@@ -221,8 +258,8 @@ public final class AttributionSource implements Parcelable {
		* @hide
		*/
		public int getNextUid() {
		if (mAttributionSourceState.next != null) {
		return mAttributionSourceState.next[0].uid;
		if (mNext != null) {
		return mNext.getUid();
		}
		return Process.INVALID_UID;
		}
		@@ -233,8 +270,8 @@ public final class AttributionSource implements Parcelable {
		* @hide
		*/
		public @Nullable String getNextPackageName() {
		if (mAttributionSourceState.next != null) {
		return mAttributionSourceState.next[0].packageName;
		if (mNext != null) {
		return mNext.getPackageName();
		}
		return null;
		}
		@@ -246,8 +283,8 @@ public final class AttributionSource implements Parcelable {
		* @hide
		*/
		public @Nullable String getNextAttributionTag() {
		if (mAttributionSourceState.next != null) {
		return mAttributionSourceState.next[0].attributionTag;
		if (mNext != null) {
		return mNext.getAttributionTag();
		}
		return null;
		}
		@@ -260,8 +297,7 @@ public final class AttributionSource implements Parcelable {
		* @return Whether this is a trusted source.
		*/
		public boolean isTrusted(@NonNull Context context) {
		return mAttributionSourceState.token != null
		&& context.getSystemService(PermissionManager.class)
		return mToken != null && context.getSystemService(PermissionManager.class)
		.isRegisteredAttributionSource(this);
		}

		@@ -274,36 +310,71 @@ public final class AttributionSource implements Parcelable {
		@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS)
		@NonNull
		public Set<String> getRenouncedPermissions() {
		if (mRenouncedPermissionsCached == null) {
		if (mAttributionSourceState.renouncedPermissions != null) {
		mRenouncedPermissionsCached = new ArraySet<>(
		mAttributionSourceState.renouncedPermissions);
		} else {
		mRenouncedPermissionsCached = Collections.emptySet();
		}
		return CollectionUtils.emptyIfNull(mRenouncedPermissions);
		}
		return mRenouncedPermissionsCached;

		@DataClass.Suppress({"setUid", "setToken"})
		static class BaseBuilder {}






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


		/* package-private */ AttributionSource(
		int uid,
		@Nullable String packageName,
		@Nullable String attributionTag,
		@Nullable IBinder token,
		@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) @Nullable Set<String> renouncedPermissions,
		@Nullable AttributionSource next) {
		this.mUid = uid;
		this.mPackageName = packageName;
		this.mAttributionTag = attributionTag;
		this.mToken = token;
		this.mRenouncedPermissions = renouncedPermissions;
		com.android.internal.util.AnnotationValidations.validate(
		SystemApi.class, null, mRenouncedPermissions);
		com.android.internal.util.AnnotationValidations.validate(
		RequiresPermission.class, null, mRenouncedPermissions,
		"value", android.Manifest.permission.RENOUNCE_PERMISSIONS);
		this.mNext = next;

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

		/**
		* The UID that is accessing the permission protected data.
		*/
		public int getUid() {
		return mAttributionSourceState.uid;
		return mUid;
		}

		/**
		* The package that is accessing the permission protected data.
		*/
		public @Nullable String getPackageName() {
		return mAttributionSourceState.packageName;
		return mPackageName;
		}

		/**
		* The attribution tag of the app accessing the permission protected data.
		*/
		public @Nullable String getAttributionTag() {
		return mAttributionSourceState.attributionTag;
		return mAttributionTag;
		}

		/**
		@@ -312,56 +383,113 @@ public final class AttributionSource implements Parcelable {
		* @hide
		*/
		public @Nullable IBinder getToken() {
		return mAttributionSourceState.token;
		return mToken;
		}

		/**
		* The next app to receive the permission protected data.
		*/
		public @Nullable AttributionSource getNext() {
		if (mNextCached == null && mAttributionSourceState.next != null) {
		mNextCached = new AttributionSource(mAttributionSourceState.next[0]);
		}
		return mNextCached;
		return mNext;
		}

		@Override
		public boolean equals(@Nullable Object o) {
		// You can override field equality logic by defining either of the methods like:
		// boolean fieldNameEquals(AttributionSource other) { ... }
		// boolean fieldNameEquals(FieldType otherValue) { ... }

		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		@SuppressWarnings("unchecked")
		AttributionSource that = (AttributionSource) o;
		return mAttributionSourceState.uid == that.mAttributionSourceState.uid
		&& Objects.equals(mAttributionSourceState.packageName,
		that.mAttributionSourceState.packageName)
		&& Objects.equals(mAttributionSourceState.attributionTag,
		that.mAttributionSourceState.attributionTag)
		&& Objects.equals(mAttributionSourceState.token,
		that.mAttributionSourceState.token)
		&& Arrays.equals(mAttributionSourceState.renouncedPermissions,
		that.mAttributionSourceState.renouncedPermissions)
		&& Objects.equals(getNext(), that.getNext());
		//noinspection PointlessBooleanExpression
		return true
		&& mUid == that.mUid
		&& Objects.equals(mPackageName, that.mPackageName)
		&& Objects.equals(mAttributionTag, that.mAttributionTag)
		&& Objects.equals(mToken, that.mToken)
		&& Objects.equals(mRenouncedPermissions, that.mRenouncedPermissions)
		&& Objects.equals(mNext, that.mNext);
		}

		@Override
		public int hashCode() {
		// You can override field hashCode logic by defining methods like:
		// int fieldNameHashCode() { ... }

		int _hash = 1;
		_hash = 31 * _hash + mAttributionSourceState.uid;
		_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.packageName);
		_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.attributionTag);
		_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.token);
		_hash = 31 * _hash + Objects.hashCode(mAttributionSourceState.renouncedPermissions);
		_hash = 31 * _hash + Objects.hashCode(getNext());
		_hash = 31 * _hash + mUid;
		_hash = 31 * _hash + Objects.hashCode(mPackageName);
		_hash = 31 * _hash + Objects.hashCode(mAttributionTag);
		_hash = 31 * _hash + Objects.hashCode(mToken);
		_hash = 31 * _hash + Objects.hashCode(mRenouncedPermissions);
		_hash = 31 * _hash + Objects.hashCode(mNext);
		return _hash;
		}

		static Parcelling<Set<String>> sParcellingForRenouncedPermissions =
		Parcelling.Cache.get(
		RenouncedPermissionsParcelling.class);
		static {
		if (sParcellingForRenouncedPermissions == null) {
		sParcellingForRenouncedPermissions = Parcelling.Cache.put(
		new RenouncedPermissionsParcelling());
		}
		}

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

		byte flg = 0;
		if (mPackageName != null) flg \|= 0x2;
		if (mAttributionTag != null) flg \|= 0x4;
		if (mToken != null) flg \|= 0x8;
		if (mRenouncedPermissions != null) flg \|= 0x10;
		if (mNext != null) flg \|= 0x20;
		dest.writeByte(flg);
		dest.writeInt(mUid);
		if (mPackageName != null) dest.writeString(mPackageName);
		if (mAttributionTag != null) dest.writeString(mAttributionTag);
		if (mToken != null) dest.writeStrongBinder(mToken);
		sParcellingForRenouncedPermissions.parcel(mRenouncedPermissions, dest, flags);
		if (mNext != null) dest.writeTypedObject(mNext, flags);
		}

		@Override
		public int describeContents() { return 0; }

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

		byte flg = in.readByte();
		int uid = in.readInt();
		String packageName = (flg & 0x2) == 0 ? null : in.readString();
		String attributionTag = (flg & 0x4) == 0 ? null : in.readString();
		IBinder token = (flg & 0x8) == 0 ? null : in.readStrongBinder();
		Set<String> renouncedPermissions = sParcellingForRenouncedPermissions.unparcel(in);
		AttributionSource next = (flg & 0x20) == 0 ? null : (AttributionSource) in.readTypedObject(AttributionSource.CREATOR);

		this.mUid = uid;
		this.mPackageName = packageName;
		this.mAttributionTag = attributionTag;
		this.mToken = token;
		this.mRenouncedPermissions = renouncedPermissions;
		com.android.internal.util.AnnotationValidations.validate(
		SystemApi.class, null, mRenouncedPermissions);
		com.android.internal.util.AnnotationValidations.validate(
		RequiresPermission.class, null, mRenouncedPermissions,
		"value", android.Manifest.permission.RENOUNCE_PERMISSIONS);
		this.mNext = next;

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

		public static final @NonNull Parcelable.Creator<AttributionSource> CREATOR
		= new Parcelable.Creator<AttributionSource>() {
		@Override
		@@ -378,9 +506,15 @@ public final class AttributionSource implements Parcelable {
		/**
		* A builder for {@link AttributionSource}
		*/
		public static final class Builder {
		private @NonNull final AttributionSourceState mAttributionSourceState =
		new AttributionSourceState();
		@SuppressWarnings("WeakerAccess")
		public static final class Builder extends BaseBuilder {

		private int mUid;
		private @Nullable String mPackageName;
		private @Nullable String mAttributionTag;
		private @Nullable IBinder mToken;
		private @Nullable Set<String> mRenouncedPermissions;
		private @Nullable AttributionSource mNext;

		private long mBuilderFieldsSet = 0L;

		@@ -390,8 +524,9 @@ public final class AttributionSource implements Parcelable {
		* @param uid
		* The UID that is accessing the permission protected data.
		*/
		public Builder(int uid) {
		mAttributionSourceState.uid = uid;
		public Builder(
		int uid) {
		mUid = uid;
		}

		/**
		@@ -400,7 +535,7 @@ public final class AttributionSource implements Parcelable {
		public @NonNull Builder setPackageName(@Nullable String value) {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x2;
		mAttributionSourceState.packageName = value;
		mPackageName = value;
		return this;
		}

		@@ -410,7 +545,7 @@ public final class AttributionSource implements Parcelable {
		public @NonNull Builder setAttributionTag(@Nullable String value) {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x4;
		mAttributionSourceState.attributionTag = value;
		mAttributionTag = value;
		return this;
		}

		@@ -443,8 +578,7 @@ public final class AttributionSource implements Parcelable {
		public @NonNull Builder setRenouncedPermissions(@Nullable Set<String> value) {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x10;
		mAttributionSourceState.renouncedPermissions = (value != null)
		? value.toArray(new String[0]) : null;
		mRenouncedPermissions = value;
		return this;
		}

		@@ -454,8 +588,7 @@ public final class AttributionSource implements Parcelable {
		public @NonNull Builder setNext(@Nullable AttributionSource value) {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x20;
		mAttributionSourceState.next = (value != null) ? new AttributionSourceState[]
		{value.mAttributionSourceState} : null;
		mNext = value;
		return this;
		}

		@@ -465,21 +598,28 @@ public final class AttributionSource implements Parcelable {
		mBuilderFieldsSet \|= 0x40; // Mark builder used

		if ((mBuilderFieldsSet & 0x2) == 0) {
		mAttributionSourceState.packageName = null;
		mPackageName = null;
		}
		if ((mBuilderFieldsSet & 0x4) == 0) {
		mAttributionSourceState.attributionTag = null;
		mAttributionTag = null;
		}
		if ((mBuilderFieldsSet & 0x8) == 0) {
		mAttributionSourceState.token = null;
		mToken = null;
		}
		if ((mBuilderFieldsSet & 0x10) == 0) {
		mAttributionSourceState.renouncedPermissions = null;
		mRenouncedPermissions = null;
		}
		if ((mBuilderFieldsSet & 0x20) == 0) {
		mAttributionSourceState.next = null;
		mNext = null;
		}
		return new AttributionSource(mAttributionSourceState);
		AttributionSource o = new AttributionSource(
		mUid,
		mPackageName,
		mAttributionTag,
		mToken,
		mRenouncedPermissions,
		mNext);
		return o;
		}

		private void checkNotUsed() {
		@@ -489,4 +629,9 @@ public final class AttributionSource implements Parcelable {
		}
		}
		}


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

		}