diff options
| author | Colin Cross <ccross@android.com> | 2022-03-08 01:44:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 01:44:11 +0000 |
| commit | 02fc1d59868bdded8cd1605983d579b2bf75e3e0 (patch) | |
| tree | e7dfe5daeab98b225bb9f472e43ea319259f4e73 /value/src/main/java/com/google/auto/value/processor/equalshashcode.vm | |
| parent | 36a0ea01bf35c89c3a1dae68cfeecde390bb4a09 (diff) | |
| parent | 24a44d71c955b83666317cb50639137639b7e277 (diff) | |
| download | auto-02fc1d59868bdded8cd1605983d579b2bf75e3e0.tar.gz | |
Merge changes from topic "google-java-format-jdk17" am: 6393823b21 am: 95df6f6cad am: 24a44d71c9t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-dev
Original change: https://android-review.googlesource.com/c/platform/external/auto/+/2008542
Change-Id: I2f6c9fe46f8f56ad35781713a93ea1a5cc2504ab
Diffstat (limited to 'value/src/main/java/com/google/auto/value/processor/equalshashcode.vm')
| -rw-r--r-- | value/src/main/java/com/google/auto/value/processor/equalshashcode.vm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/value/src/main/java/com/google/auto/value/processor/equalshashcode.vm b/value/src/main/java/com/google/auto/value/processor/equalshashcode.vm index 094f6c3c..03e25c2b 100644 --- a/value/src/main/java/com/google/auto/value/processor/equalshashcode.vm +++ b/value/src/main/java/com/google/auto/value/processor/equalshashcode.vm @@ -49,7 +49,7 @@ this.$p == that.${p.getter}() ## #elseif ($p.kind == "ARRAY") `java.util.Arrays`.equals(this.$p, ## - (that instanceof $subclass) ? (($subclass) that).$p : that.${p.getter}()) ## + (that instanceof $subclass) ? (($subclass$wildcardTypes) that).$p : that.${p.getter}()) ## #elseif ($p.nullable) (this.$p == null ? that.${p.getter}() == null : this.${p}.equals(that.${p.getter}())) ## #else |