| commit | d20d16da880d2354150c16846944f7c00e6f67a9 | [log] [tgz] |
|---|---|---|
| author | Nate Myren <ntmyren@google.com> | Sat Sep 02 00:04:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 02 00:04:23 2023 +0000 |
| tree | 5f9aed44e8ae722dbe7e5e7f38947d0a722c068c | |
| parent | f00c449b233bce54498c2d89aeb4e2da37f985a5 [diff] | |
| parent | 1aae7a96c7f82318ed27590eaf4b22b94f17d4e8 [diff] |
Merge "Remove token check from equalsExceptToken" into udc-qpr-dev am: 55bca7e336 am: 1aae7a96c7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24639295 Change-Id: I32e6ef9ef786cfb569cf026183eb7ae9e8a65c0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java index df385b0..15678a7 100644 --- a/core/java/android/content/AttributionSource.java +++ b/core/java/android/content/AttributionSource.java
@@ -576,8 +576,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());