summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from b9fce10f18043a4ec83d8e34be550f3b74ace731 to ↵aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-releaseAndroid Build Coastguard Worker
mainline-uwb-release Change-Id: Ia16d755873fba0dde4eb938591792b52c1c0c487
2023-02-25Merge "Add traces to explain test failures" am: 444ea4c79f am: e9d03d4ff9 ↵Treehugger Robot
am: c0f5df56ce am: dbbbe2bb18 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706 Change-Id: Ic3d438ee588c27da6b245e3b46c5f6b61d6ad626 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25Merge "Add traces to explain test failures" am: 444ea4c79f am: e9d03d4ff9 ↵android14-devTreehugger Robot
am: c0f5df56ce Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706 Change-Id: I1079096292854d1e83629141dc85b4c6c6a8b5b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25Merge "Add traces to explain test failures" am: 444ea4c79f am: e9d03d4ff9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706 Change-Id: Iefe3bc1d21414edb5b1147a457ef774800fc1158 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25Merge "Add traces to explain test failures" am: 444ea4c79fandroid-u-beta-1-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706 Change-Id: I7208675e1fe2f5a6a7cdf832cf63e65037b5fb0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge "Add traces to explain test failures"Treehugger Robot
2023-02-24Add traces to explain test failuresFabien Sanglard
Test: NA Bug: presubmit failure in aosp/2431157 Change-Id: I71a8aab85ab620a5a81d2a7da3cd793b24a69947
2023-02-14Merge "Reset LogManager after each test method in LogManagerTest" am: ↵Victor Chang
d6b6238c8b am: f22f55ebaf am: 0acb7b2601 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2432713 Change-Id: I5770de29e65f68e20b09f712b2c398c008832eaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge "Reset LogManager after each test method in LogManagerTest" am: ↵Victor Chang
d6b6238c8b am: f22f55ebaf Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2432713 Change-Id: I8331c90b652a25a8c1fb8ae6bd407c61436abfcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge "Reset LogManager after each test method in LogManagerTest" am: d6b6238c8bVictor Chang
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2432713 Change-Id: If743b6f879a763692fef89705e508d062d10a841 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge "Reset LogManager after each test method in LogManagerTest"Victor Chang
2023-02-13Reset LogManager after each test method in LogManagerTestVictor Chang
Bug: 263064468 Test: atest CtsLibcoreTestCases:org.apache.harmony.logging.tests.java.util.logging.LogManagerTest Change-Id: Ibc8d357b46713dccd21c090eecbe7608f8c5dff5
2023-01-24Merge "Clean up people no longer working in this part of the platform" am: ↵Treehugger Robot
67f15307ef am: 1dd38a4f74 am: 7625093a96 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2400253 Change-Id: I03ea8ec77bf6b2b2a6d9d5e30c770cfa846e191b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Clean up people no longer working in this part of the platform" am: ↵Treehugger Robot
67f15307ef am: 1dd38a4f74 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2400253 Change-Id: I7eeceedd8a80979bbd930aa1be98c73c15c6c423 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Clean up people no longer working in this part of the platform" am: ↵Treehugger Robot
67f15307ef Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2400253 Change-Id: I868e51183906b49a7228e0d4a627b7905e2cb880 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24Merge "Clean up people no longer working in this part of the platform"Treehugger Robot
2023-01-23Clean up people no longer working in this part of the platformSam Saccone
Change-Id: I0ca9293e135d599a9d672d5ad986e74b78a166af
2022-12-16Merge "Fix event parsing" am: 097f8eff8e am: fb09e01f16 am: 65e8fcb86eFabien Sanglard
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2346823 Change-Id: I5bf303971f615846c40a40f09a9f2b06eda6ce6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Merge "Fix event parsing" am: 097f8eff8e am: fb09e01f16Fabien Sanglard
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2346823 Change-Id: Iff8ca97ab5bcdf8ecaade258cf83910c539091f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Merge "Fix event parsing" am: 097f8eff8eFabien Sanglard
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2346823 Change-Id: Ia7d61e44d4fba3d4348393f8ec325786e829cfb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Merge "Fix event parsing"main-16k-with-phonesFabien Sanglard
2022-12-15Fix event parsingFabien Sanglard
ART tests are failing with the introduction of aosp/2320257. The issue is that PacketDispatcher assumes that is a packet is not a response to a cmd, it is an Event:Composite which is incorrect. It could also be a JDWP extension event such as DDM. Bug: 262643398 Test: Used the following tests mkdir master-art; cd master-art repo init -u https://android.googlesource.com/platform/manifest -b master-art --partial-clone --clone-filter=blob:limit=10M . build/envsetup.sh lunch armv8-eng art/tools/buildbot-build.sh --host art/tools/run-libjdwp-tests.sh --mode=host --test org.apache.harmony.jpda.tests.jdwp.VirtualMachine_ExitTest#testExit001 Change-Id: I9bfd325975b4ab9b4a556adb221ab7a249f7c491
2022-12-15Merge "Check for nest annotations in SyntheticMethodsTest" am: a63065e86e ↵Treehugger Robot
am: 1780f63099 am: 961de4c107 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2358779 Change-Id: Ie02ca32ef1974d257a8d893af6c01ce70f291362 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15Merge "Check for nest annotations in SyntheticMethodsTest" am: a63065e86e ↵Treehugger Robot
am: 1780f63099 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2358779 Change-Id: I0f27c0271d28d34f54244564d110305315124c8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15Merge "Check for nest annotations in SyntheticMethodsTest" am: a63065e86eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2358779 Change-Id: I5a1860ed7c4dae5e6f98dd39c34fe9f84a6828ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15Merge "Check for nest annotations in SyntheticMethodsTest"Treehugger Robot
2022-12-15Check for nest annotations in SyntheticMethodsTestSorin Basca
If nest group annotations are enabled, then there won't be any synthetic methods to be found. So the SyntheticMethodsTest has been changed to expect synthetic methods when the annotations are not present, otherwise it will expect no synthetic methods. Bug: 210843415 Test: atest --host CtsJdwpTestCases:org.apache.harmony.jpda.tests.jdwp.ReferenceType_SyntheticMethodsTest Change-Id: I76f59ada8fe40122cf1aefdb065f3a73519bb3a2
2022-11-08Merge "Make TimestampTest non-dependant on device's time zone." am: ↵Almaz Mingaleev
9fc89e05f9 am: 74dc1b7f6e am: 0c53783a21 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2292038 Change-Id: I87d979088e24c53440d843e6029531b4cd4e4c01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08Merge "Make TimestampTest non-dependant on device's time zone." am: ↵Almaz Mingaleev
9fc89e05f9 am: 74dc1b7f6e Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2292038 Change-Id: Ib48ab167d05804dddcc217ff5c9ba6c920c2c32c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08Merge "Make TimestampTest non-dependant on device's time zone." am: 9fc89e05f9Almaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2292038 Change-Id: I3be50688d4e7aea1de7bb6989aa6fa8e2b57021c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08Merge "Make TimestampTest non-dependant on device's time zone."Almaz Mingaleev
2022-11-08Make TimestampTest non-dependant on device's time zone.Almaz Mingaleev
testGetMonth and testGetYear explicitly rely that current device's time zone is within small range around unix epoch. But time zones with big enough positive offsets like Pacific/Fiji break that expectation. Hence setting time zone to GMT as these values expect. Fix: 258160206 Test: passes when time zone set Pacific/Fiji (test fails w/o this Test: patch) Change-Id: I04b2ecd33f8e5c74ff9fff40450aaa2bb7868769
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 461ae793e8 am: ↵Treehugger Robot
5641b78d62 am: f71f91cb1a Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2254240 Change-Id: Ic1ed8407b2493fe9f694b5352a590e9aa2e735e7 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: 461ae793e8 am: ↵Treehugger Robot
5641b78d62 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2254240 Change-Id: I6904aaf5fe3429782ad57f20fef7edbc94c24944 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: 461ae793e8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2254240 Change-Id: I498229fdcb7098fa0fc046700f35cd9fb2faae6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors"Treehugger Robot
2022-10-15Fix 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: I7bf6650535ba24acd1f253910148fa4728c0d3c4
2022-08-26Merge "Deflake SimpleFormatterTest." am: 77bbae5871 am: c8d85c5761 am: ↵Treehugger Robot
c4aff7e2b4 am: 7054b87973 am: c93175a6bb Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499 Change-Id: Ia87340ca64f90912d2f1344f7aa8ff5bfab89c21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26Merge "Deflake SimpleFormatterTest." am: 77bbae5871 am: c8d85c5761 am: ↵Treehugger Robot
c4aff7e2b4 am: 7054b87973 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499 Change-Id: Id7987f0fb4be395b8f197425d636bd297be7b349 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26Merge "Deflake SimpleFormatterTest." am: 77bbae5871 am: c8d85c5761 am: ↵Treehugger Robot
c4aff7e2b4 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499 Change-Id: Icfc2f5f7062ed27d1a9ec957a0510458af51ab7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26Merge "Deflake SimpleFormatterTest." am: 77bbae5871 am: c8d85c5761Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499 Change-Id: I5c44fa498e86abd241d8223a77c4b656aef561e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26Merge "Deflake SimpleFormatterTest." am: 77bbae5871Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499 Change-Id: Ieb6d93e025c26742924b15a4164ea626c7298631 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26Merge "Deflake SimpleFormatterTest."Treehugger Robot
2022-08-26Deflake SimpleFormatterTest.Almaz Mingaleev
This test was passing on UTC, Europe/London and America/Los_Angeles, but failing on Nuuk or America/Santiago. Bug was in current year calculation: LogRecord's time is set to 0, but Calendar was set to 12321312 millis, which about 3.5 hours. So, if time zone's offset is negative and small enough 0 and 12321312 epoch millis will be in different years - in 1969 and 1970 correspondingly. Bug: 155075213 Fix: 155075213 Test: atest CtsLibcoreTestCases:org.apache.harmony.logging.tests.java.util.logging.SimpleFormatterTest Test: passes will all the time zones mentioned above Change-Id: I19b214c5a809d084e5ed1b67aca96f9c44b2519b
2022-06-09Snap for 8701348 from 38571570056f25806cde71d5ae66817ef5f6bad4 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: I56a9fcf4e2ab4eb5df81894baed9b80c564906e1
2022-05-13[automerger skipped] Add test for DriverManager.getConnection() am: ↵Victor Chang
aa9807c512 am: ff3c5f008a -s ours am: c095c08b0c -s ours am: bf9e8dd800 -s ours am skip reason: Merged-In I7e3c197553c0f5df5d224d6934795cfbfb3ee9fb with SHA-1 aa9807c512 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/18235482 Change-Id: I0e43fa4625f8e246e8d8ff84030d583f6bc4d351 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13[automerger skipped] Add test for DriverManager.getConnection() am: ↵Victor Chang
aa9807c512 am: ff3c5f008a am: ed7345a216 -s ours am: dd780d2910 -s ours am skip reason: Merged-In I7e3c197553c0f5df5d224d6934795cfbfb3ee9fb with SHA-1 aa9807c512 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/18235482 Change-Id: I9be911a9d617121208aa4c858707714b128678ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12[automerger skipped] Add test for DriverManager.getConnection() am: ↵Victor Chang
aa9807c512 am: ff3c5f008a -s ours am: c095c08b0c -s ours am skip reason: Merged-In I7e3c197553c0f5df5d224d6934795cfbfb3ee9fb with SHA-1 aa9807c512 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/18235482 Change-Id: I7ecf5734784f2262323c5eb10696fe309206e797 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12[automerger skipped] Add test for DriverManager.getConnection() am: ↵Victor Chang
aa9807c512 am: ff3c5f008a am: ed7345a216 -s ours am skip reason: Merged-In I7e3c197553c0f5df5d224d6934795cfbfb3ee9fb with SHA-1 aa9807c512 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/18235482 Change-Id: I86f6b88a53a1c566a5d2512b8a450f72d94d5889 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12[automerger skipped] Add test for DriverManager.getConnection() am: ↵Victor Chang
aa9807c512 am: 3857157005 -s ours am skip reason: Merged-In I7e3c197553c0f5df5d224d6934795cfbfb3ee9fb with SHA-1 aa9807c512 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/18235482 Change-Id: I4d4489f76661d25549f49f43517c7d55d8348b19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>