| commit | 1aae7a96c7f82318ed27590eaf4b22b94f17d4e8 | [log] [tgz] |
|---|---|---|
| author | Nate Myren <ntmyren@google.com> | Fri Sep 01 23:57:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 01 23:57:30 2023 +0000 |
| tree | e7ccca9f949d0b21e82af9d524751df7e258d920 | |
| parent | f794f49bc3ffd72e8ec2274d23b5d9ccf4cd24c3 [diff] | |
| parent | 55bca7e336de3758b8d971dfdda147bc9e02cde5 [diff] |
Merge "Remove token check from equalsExceptToken" into udc-qpr-dev am: 55bca7e336 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24639295 Change-Id: I12b601de9ff08e3e1cc0a95bd40b7c58ff017aa3 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 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());