aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-05Merge "Minor change: Remove empty statement in DexMaker" into main am: ↵HEADmastermainTreehugger Robot
9fe24be105 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2928856 Change-Id: I39e3ef0e4fa3399aff5d69fa2de73aa5e51b33c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05Merge "Minor change: Remove empty statement in DexMaker" into mainTreehugger Robot
2024-01-26Minor change: Remove empty statement in DexMakerSorin Basca
Test: TH Change-Id: Ide74cc51907912883e658db7f049bcce3675fc01
2023-11-20Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1 am: ↵Cole Faust
1e870bcbf4 am: a4d1b248ee Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589 Change-Id: I9d476eda90464e1791427a39c63e30ac4f3a9cd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1 am: ↵Cole Faust
ba67b722ac am: 3564ecebe7 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589 Change-Id: I87795bf40957841c2b9337b3ab90fb5e261a3b96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1 am: ↵Cole Faust
1e870bcbf4 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589 Change-Id: I3bbb27df4274ad88fb71406eaf66a663fbc35f19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1 am: ↵Cole Faust
ba67b722ac Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589 Change-Id: I3e6314b73ddc508d640967b3faa30d9ab11ce6c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589 Change-Id: Ie4a5e90013aebb713536fc95ee43e6dce05ebd76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Demote InfiniteRecursion to a warning" into main am: e04b965cb1Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2829589 Change-Id: Ia97c0bdca201372a59ae88f095ae35d768fb1c5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Demote InfiniteRecursion to a warning" into mainCole Faust
2023-11-17Demote InfiniteRecursion to a warningCole Faust
Errorprone is being updated, and now catches this issue. Bug: 311064136 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: If7557063221e42de00bef8507c8e46dfcfb79ecd
2023-10-26Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into ↵Automerger Merge Worker
udc-qpr-dev-plus-aosp am: 9d7d4a5ee6 -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 4f1187680f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I9ff5a8e122a653241ebf2184194d53461e4e0423 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
760a02687f -s ours am: 3a829b977e -s ours am: 5e1b9e0cfc -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I964b07fd1d521a0eafcb0f37773caab9beca7cf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
760a02687f -s ours am: 21f49c9dd8 -s ours am: 6ccd36a251 -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: Ic3f97da7b09839d73547ca67f0d31033977faa5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: af41386238 -s ours am: ↵Xin Li
9d57956732 -s ours am: 31d0491f05 -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I45e99f1f239c2d548488a35dd42d13543c897baa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into ↵Automerger Merge Worker
udc-qpr-dev-plus-aosp * changes: [automerger skipped] Merge "Merge android14-tests-dev" into main am: 760a02687f -s ours am: 3a829b977e -s ours [automerger skipped] Merge android14-tests-dev am: af41386238 -s ours am: d75e9a614d -s ours
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
760a02687f -s ours am: 3a829b977e -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I51d3b43372604bbbea80d2618824664d9eb8af15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: af41386238 -s ours am: ↵Xin Li
d75e9a614d -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: Ie38487f6e75f30b6b366a44a2ed267e4a8395911 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
760a02687f -s ours am: 21f49c9dd8 -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: If962b62f08ef9554a8c1f170dd22ca3272ee6bc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: af41386238 -s ours am: ↵Xin Li
9d57956732 -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I6d8dc02c36b0d74fb92a1124d2989bb59a01f303 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
760a02687f -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I04f062f9db796b62ed7b84b03add58d013eb62aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: af41386238 -s oursXin Li
am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: I9da964a7bd8b0079c4bcd4efe15e7da534113a08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
760a02687f -s ours am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: Ifc952f42af55bdf6df76689ce727fef9659ec119 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: af41386238 -s oursXin Li
am skip reason: Merged-In Idd3961dcc4d01d33b7ca47f853f5e684b9382512 with SHA-1 45adaa6fbe is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2781423 Change-Id: Id0d12b1824f7a4a899994b2e8693c77082968e50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26Merge "Merge android14-tests-dev" into mainXin Li
2023-10-10Merge android14-tests-devXin Li
Bug: 263910020 Merged-In: Idd3961dcc4d01d33b7ca47f853f5e684b9382512 Change-Id: I447c275fff35a593e1275a00a2e6ba9ca6f390d6
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: 3d00e25867 am: f607450688 am: 8fab4043ad Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I2be95047cc55a8b50345ecb588076d3a600548be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: a59920af56 am: 839507de23 am: 26745b9a78 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I167af4d5edeeee18bd5c542d2fb02bc4da87560c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: a59920af56 am: 2e2daa9878 am: 330adcf6a0 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I1c81c9375ba7d2d212476613b98877f29efd61f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: 10825f638d am: 801d564c93 am: 2ad13eb03f am: fe220c1bc2 am: 85b76f9e1e Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I9638c6722c70896cbec93156f743a78d590d6753 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: 3b5567d44e am: 33d19b9002 am: b98a33b23f am: 425bee115e am: cb1029969a Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ic90b998b81f9caef3f664d199dc963ca0ee7ec29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: 10825f638d am: 801d564c93 am: 247fbc28c2 am: 8ca4018672 am: 7b1a8e4c9c Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ibcdc84899aa3a46f360ed0dc8017dc5795885eac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Merge "Increase mockALot timeout to 17 minutes" into ↵Automerger Merge Worker
android13-tests-dev am: e678c7d33a" into main am: 77fb7f77bd am: 8757207443 am: f62f863ed9 am: ccb8e60fae am: 1435b3d9c9 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ifd5a6b4f8951938709cfd250a548b2ba91df1610 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: 3b5567d44e am: 33d19b9002 am: 249d07a1b6 am: 38624b690f am: 73d74b661c Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ibfb6d01b882b32fe75062d0de5d1a6edb899e8ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: 10825f638d am: 801d564c93 am: 2ad13eb03f am: d781f498dc am: 1f604a2d26 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ie59f2bebe19077f8981c2d09b2e6d403bb4cb748 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: 3b5567d44e am: 33d19b9002 am: b98a33b23f am: b0d0704a39 am: abf2fe95c8 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: If067087fc6c92a61b2fc62468517c5a329557498 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: 3d00e25867 am: f607450688 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I08339cbc5f0902b2df64e25406d9aa7faddbc69d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: a59920af56 am: 839507de23 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I9dcc04ff3c7b64366c6c3916214f6db5de7a4a67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: 3d00e25867 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I387ee798e4fa555f2210fab164ae18e7adffd920 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: 76706c682d Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ic324342e5217c6fe5c7123cb81eec948658800f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: a59920af56 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I5f3d95f67775e415b36c2e38e03cef8eea0020b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: a59920af56 am: 2e2daa9878 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I34fb6ba7f92af62386dac7e75c1c2fd05b2a9fb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: 10825f638d am: 801d564c93 am: 2ad13eb03f am: fe220c1bc2 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I2767e2caf7f3f4d7ba7fd1b0e95a671abe6e294c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: 3b5567d44e am: 33d19b9002 am: b98a33b23f am: 425bee115e Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Idb58064f1a5eda36b05066726b4a6c51ab5d73e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: e28c176293 am: 2e8013f3ce am: f6119e9049 am: a59920af56 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: If1f4286c328e5054f6ea53856f19472def9116b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: 10825f638d am: 801d564c93 am: 247fbc28c2 am: 8ca4018672 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I6517c8432589cbe4adc7b7a1c8cd3dde7a386ddb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Merge "Increase mockALot timeout to 17 minutes" into ↵Automerger Merge Worker
android13-tests-dev am: e678c7d33a" into main am: 77fb7f77bd am: 8757207443 am: f62f863ed9 am: ccb8e60fae Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I7e56b213b8cb4cff0ebc3998e966a1a7f0eaf319 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: 3b5567d44e am: 33d19b9002 am: 249d07a1b6 am: 38624b690f Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: If6e51fe44bbc9511277a1f9c8f9a69e060750586 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: ce32e2c127 am: 10825f638d am: 801d564c93 am: 2ad13eb03f am: d781f498dc Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Icb049617fe80796b39b67dfb536342742d487f4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: ↵Eduard Olteanu
e678c7d33a am: 3b5567d44e am: 33d19b9002 am: b98a33b23f am: b0d0704a39 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I269a1b3b069b25c856489f1b5adf0c0fbb34c62e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 08:19:26 +0000