commit 670a363dc9cdbb00aef8a84a19ea9505863b9dc9
author Nate Myren <ntmyren@google.com> Fri Sep 01 14:01:08 2023 -0700
committer Nate Myren <ntmyren@google.com> Fri Sep 01 21:23:49 2023 +0000
tree 6afb9f64d576855671b5439ad021c5b0f9c97d98
parent 0f78d29c0169e3ccabbee715b8e79107025e4123

Remove token check from equalsExceptToken

Bug: 298690356
Fixes: 297439290
Test: atest OnDeviceRecognitionServiceTest
Test: atest CameraMicIndicatorsPermissionTest
Change-Id: I5731ceeab5b9d0c72ce0131e2c9ba2f74558218c

core/java/android/content/AttributionSource.java

diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java
index 2f2ec90..b4f4a7e 100644
--- a/core/java/android/content/AttributionSource.java
+++ b/core/java/android/content/AttributionSource.java
@@ -544,8 +544,6 @@
                 o.mAttributionSourceState.packageName)
                 && Objects.equals(mAttributionSourceState.attributionTag,
                 o.mAttributionSourceState.attributionTag)
-                && Objects.equals(mAttributionSourceState.token,
-                o.mAttributionSourceState.token)
                 && Arrays.equals(mAttributionSourceState.renouncedPermissions,
                 o.mAttributionSourceState.renouncedPermissions)
                 && Objects.equals(getNext(), o.getNext());