aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-02Snap for 11041982 from 76706c682d4cabaa5ea2bc72f7365e8b2b1fd6c0 to ↵aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030android14-mainline-uwb-releaseAndroid Build Coastguard Worker
mainline-uwb-release Change-Id: I670614b8621a3cf9119e84699366750601c61aee
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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I902eab10186bc88a358c3ee4a0337cdb889a2ea6 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I7c57005c0b7fbd851e76a9920c2088dec0a78f0d 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Idbd1053d53fbae67e831b32eabc1ead6c88d205e 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I497e42b81f86c94114165747014ca9ede7310fbe 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I7a5f006cf482e380bfa904af448eab3f740d4628 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Ic1ee50f5c0062acc737b4ace754eff902fafe20f 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I2b19f99f1b8a1cc9edbc51dd716fd7ca8e04b2da 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I591dd8a6255c2f9b99db4c1d0489740d874b9583 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I0198213862be812947fca6c4a1eabfa364c42d6e 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: ↵android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android14-tests-releaseandroid14-tests-devEduard Olteanu
e678c7d33a Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I890ce0b6a0481cf705092ab9e3cdd2b10a7c0a4c 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 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Id49221e1d7c9bbb1e283f43dedf961dbe07485af 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-devandroid13-tests-devEduard Olteanu
2023-09-08Increase mockALot timeout to 17 minutesEduard Olteanu
This is needed for low end devices (including Rohan). It was also a test improvement in b/292210010 but this is submitted with another CL that also accounts for shell timeout because the shell was getting timed out before the test finished. Bug:298611502 Test: run cts -m CtsInlineMockingTestCases -t com.android.dx.mockito.tests.Stress#mockALot Change-Id: Ida5f545ed123c1dea56e7e87efb43daf325e9470 Signed-off-by: Eduard Olteanu <eduardolteanu@google.com>
2023-08-04Snap for 10609607 from 90cba94e9a4cfe9a3b779b3040fc843d5824f728 to ↵aml_uwb_341111010aml_uwb_341011000Android Build Coastguard Worker
mainline-uwb-release Change-Id: Ia9a9b7d7e88711e514e9514dd9ec6f5f939ad9fa
2023-07-26Increase mockALot timeout to 17 minutes am: 4f1187680f am: 323edd8ce8yinwei.sun1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/24198006 Change-Id: I904b883d5d1a68e4623555a06a21338fd7a08a99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26Increase mockALot timeout to 17 minutes am: 4f1187680fyinwei.sun1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dexmaker/+/24198006 Change-Id: Iacba66d74d64ac36a9192d1f86b7a637d3aacad8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Increase mockALot timeout to 17 minutesyinwei.sun1
Bug: 292210010 Test: atest CtsInlineMockingTestCases Change-Id: Idd3961dcc4d01d33b7ca47f853f5e684b9382512
2023-07-07Snap for 10453563 from 26bee24e72ea8883c6a2e8e1d76cafacdf9248fb to ↵Android Build Coastguard Worker
mainline-uwb-release Change-Id: I0a86023d0367986ad084f07e7da16392bb7fff18
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646 am: ↵android14-devCole Faust
cb0e023d05 am: aa85d73d5c Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483 Change-Id: Ie58957e6ad6dade523ac7335e89e6d0f75d03c80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646 am: ↵android-u-beta-1-gplCole Faust
cb0e023d05 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483 Change-Id: I65cd7be54f57bff665b3bd685e8e5556c33a2ac0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 4c6cbd9646main-16k-with-phonesCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2255483 Change-Id: I58c8a85c6f0e4fab1aa0235a8a2f073f567334a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors"Cole Faust
2022-10-25Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I90dbb22c68efb56bc5e09114c35811805e7cf095
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632 ↵John Wu
am: d454288adf am: e6a513053f am: 59c84ac643 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: I2acd251751cc65a229323ca0bc6727c1b8385193 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632 ↵John Wu
am: d454288adf am: e6a513053f Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: Ie957ba5f4f3e8341a11bae4e5bb755d0c6795bf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632 ↵John Wu
am: d454288adf Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: I4b96e17f8a540006ad863228b3d6692e04f4918d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7b am: 4497655632John Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: I3d981ffde7ec50ed3816f569fb56e1f517e5f1b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker"" am: 60da4e1d7bJohn Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2218809 Change-Id: If9668c7a4deaf433a6d15841af7a4eff6d8adcf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Merge "Revert^2 "Update to upstream dexmaker""John Wu
2022-09-26Revert^2 "Update to upstream dexmaker"John Wu
Cherry-pick "Do not read Build.VERSION to allow non-standard Android distributions (Ia8c4ba4c82cd6f193c565f1bfe48faffc4aac08f)" to fix ART host tests. 783d1254b1698492fd8ae7e04a20115d1283ba60 Change-Id: Iec6a60d0016f50101fe9151931065dc04148c767
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c ↵Nicolas Geoffray
am: 79aba3b995 am: 7213f34055 am: 7fc0cee7c5 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: Ibe5557fc7a7f6ba49b6e6cd527474edce4349889 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31f am: ↵John Wu
1d86ea6286 am: bdbe2a83d9 am: 6fa21669c5 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: Id49ea2631147698ce7f787589f8d3d2fb1f603a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c ↵Nicolas Geoffray
am: 79aba3b995 am: 7213f34055 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I2651a6e6817c811080dbee496f9beefc972cb7bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31f am: ↵John Wu
1d86ea6286 am: bdbe2a83d9 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: I654b7e5e22a621ca0ae036efa9fe94d3149849a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c ↵Nicolas Geoffray
am: 79aba3b995 Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I2b9c951c881dcfef6b6d95978049b22f5576f1e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31f am: 1d86ea6286John Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: I8d616471c4bb2d9f00154d6043bf2de6fd0eb522 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99cNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I687272809294029ac2549096058bf2e8bc247110 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Merge "Update to upstream dexmaker" am: c184f17a94 am: cdd9c2d31fJohn Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: Ia0cb81ecb509cc8442aee4619cee9e4359dc9864 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7bNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810 Change-Id: I425e325643879e2e1d2b92eececd29b42d8d37a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15Merge "Revert "Update to upstream dexmaker""Nicolas Geoffray
2022-09-15Revert "Update to upstream dexmaker"Hans Boehm
Revert "Update CTS tests" Revert "Enforce files loaded in DexFile to be read-only" Revert "Enforce files loaded in DexFile to be read-only" Revert submission 2086507-ro_java_dcl Reason for revert: Causes ART host tests to fail. Reverted Changes: I736ccfb6d:Update CTS tests Ie081df900:Update to upstream dexmaker Id635fbc79:Enforce files loaded in DexFile to be read-only I700af94d4:Enforce files loaded in DexFile to be read-only Change-Id: I459aeb8ec63836200dd68596a5adbb5c4d9a56b5
2022-09-14Merge "Update to upstream dexmaker" am: c184f17a94John Wu
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2128792 Change-Id: Ie79c7536ab7a22485eec71f6f92ba1567e011988 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14Merge "Update to upstream dexmaker"John Wu
2022-09-12Update to upstream dexmakerJohn Wu
New changes are submitted upstream to support latest Java DCL restrictions added to the platform. Test: m Bug: 218865702 Change-Id: Ie081df9004c01d9e4e1bcefba22cce3d92f49d4a
2022-06-09Snap for 8701348 from 52f1a104981757b44fd5134d563ea0f0a158dab4 to ↵aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010android13-mainline-uwb-releaseAndroid Build Coastguard Worker
mainline-uwb-release Change-Id: I53da50431745d7c662450dc37539db177bc784c5
2022-04-28Snap for 8513843 from ecb8636406ec1c4c89e721e38d570e8c19bba866 to ↵Android Build Coastguard Worker
mainline-uwb-release Change-Id: Icae753396eaa3799f8b07339a3537fae72a8022b
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours am: ecb8636406 -s ours am: 52f1a10498 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: Ib98d06aefc112f8d97a37f300080a8f1d9aafcb7
2022-03-23[automerger skipped] Merge "Mark ab/8191998 as merged" into ↵Xin Li
android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours am: b704d7b140 -s ours am: 901b848b4b -s ours am: 6124ea4118 -s ours am: 9a89c17126 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I11c6f68e4513551aff6e5bffdf765e96816400c1
2022-03-23[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours am: ecb8636406 -s ours am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244 Change-Id: I9bcaa95ceed4bee1e10f3485e94f6d0144941964
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 06:30:54 +0000