summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-25Merge "Mark ApacheXML tests as @FlakyTest" into main am: 68d4acad32 am: ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseTreehugger Robot
092dcaace9 am: db26a9f927 am: 6803fd12d0 am: 966c2a2f6e Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2673675 Change-Id: Ida6f3e707e1137765eeeeabb9a348125e9982761 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Mark ApacheXML tests as @FlakyTest" into main am: 68d4acad32 am: ↵Treehugger Robot
092dcaace9 am: db26a9f927 am: 6803fd12d0 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2673675 Change-Id: If5d23861a40b5706815174c33077eaedb87fdfc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Mark ApacheXML tests as @FlakyTest" into main am: 68d4acad32 am: ↵Treehugger Robot
092dcaace9 am: db26a9f927 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2673675 Change-Id: I15035a172127998ab6110866f797a12039af6fce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Mark ApacheXML tests as @FlakyTest" into main am: 68d4acad32 am: ↵Treehugger Robot
092dcaace9 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2673675 Change-Id: Ic7eba6cc68b7c4523e794202f26d6fade32e0998 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Mark ApacheXML tests as @FlakyTest" into main am: 68d4acad32Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2673675 Change-Id: Idfa3eb882908a7824930ece2a532336c249055dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Mark ApacheXML tests as @FlakyTest" into mainTreehugger Robot
2023-07-25Mark ApacheXML tests as @FlakyTestVictor Chang
because apparently the tests may cause memory leaks. If this CL stops the flakiness, we should consider the medium-term fix b/292520220. Bug: 292296869 Test: atest --test-mapping libcore -- --module-arg 'CtsLibcoreTestCases:include-filter:org.apache.qetest' The above command runs no test Change-Id: Ic062fb556f7c75c979a16cbda1085ab4395ef27b
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 3b2d750df7 -s ↵Xin Li
ours am: 2589c0ccb5 -s ours am: 723243b9e4 -s ours am: 8a0a7e936a -s ours am skip reason: Merged-In I467a4020f47032eaadb1e7a1218dfd3e48136beb with SHA-1 e52af4761e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-xml/+/24085914 Change-Id: I5d6007116b2ce665ec31eef808e7a259413a391f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 3b2d750df7 -s ↵Xin Li
ours am: 2589c0ccb5 -s ours am: 723243b9e4 -s ours am skip reason: Merged-In I467a4020f47032eaadb1e7a1218dfd3e48136beb with SHA-1 e52af4761e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-xml/+/24085914 Change-Id: Id79bfaa762df26e663dff4fa03ca539c26cb3e1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 3b2d750df7 -s ↵Xin Li
ours am: 2589c0ccb5 -s ours am skip reason: Merged-In I467a4020f47032eaadb1e7a1218dfd3e48136beb with SHA-1 e52af4761e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-xml/+/24085914 Change-Id: If2cc2948b30c769abc4c60a0d663dcbbb14339d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 3b2d750df7 -s oursXin Li
am skip reason: Merged-In I467a4020f47032eaadb1e7a1218dfd3e48136beb with SHA-1 e52af4761e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-xml/+/24085914 Change-Id: I2068afc4fff4d6684d99ee84a9d39df9053175e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I467a4020f47032eaadb1e7a1218dfd3e48136beb Change-Id: I1d92aa198324017977cd35cd9046b3800b48b222
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases" am: f617af1a66 am: ↵Victor Chang
ac34361e46 am: 229e50ec90 am: 085d2a50bb am: ab98d81eb9 am: 22c4fba966 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643661 Change-Id: I5755aa0cfb50a322c7fd1375db217914f8256a5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10" am: 52bcda7324 ↵Victor Chang
am: 4ff52b81bf am: 9ac7a37dc9 am: 3e36dad3c7 am: 9025f8d04a am: 8628ae3b41 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643660 Change-Id: Icb39081db42ca0b2fa77a7661e58dffcdba7cc4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases" am: f617af1a66 am: ↵Victor Chang
ac34361e46 am: 229e50ec90 am: 085d2a50bb am: ab98d81eb9 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643661 Change-Id: I854e3f4798a3b1aef684a1943dc9f2c9d6b54564 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10" am: 52bcda7324 ↵Victor Chang
am: 4ff52b81bf am: 9ac7a37dc9 am: 3e36dad3c7 am: 9025f8d04a Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643660 Change-Id: I9807b90e64b45f0d6855eb6400d2df39197ddc58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases" am: f617af1a66 am: ↵Victor Chang
ac34361e46 am: 229e50ec90 am: 085d2a50bb Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643661 Change-Id: If9721f57c9d7b79a960c1280b8ed9b2c5cb5db81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10" am: 52bcda7324 ↵Victor Chang
am: 4ff52b81bf am: 9ac7a37dc9 am: 3e36dad3c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643660 Change-Id: Ic8174a03c327379bb493ad41acd2925d8472da94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases" am: f617af1a66 am: ↵Victor Chang
ac34361e46 am: 229e50ec90 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643661 Change-Id: I4194901bc48771b9fcd2e7b7f093f93693d0cbc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10" am: 52bcda7324 ↵Victor Chang
am: 4ff52b81bf am: 9ac7a37dc9 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643660 Change-Id: I4deda778c0c57f115aeca3381d04a655442fca25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases" am: f617af1a66 am: ac34361e46Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643661 Change-Id: Ic53a555558ffbc6b7f5e19816d4c2cf18c6433ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10" am: 52bcda7324 ↵Victor Chang
am: 4ff52b81bf Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643660 Change-Id: Id38743057d677532af3e63218c7c8e8bce1ae376 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases" am: f617af1a66Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643661 Change-Id: I6eafe6d1b30a27f5578cd092e8462bbdbdbbacd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10" am: 52bcda7324Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2643660 Change-Id: I37ecfcf287a7bc6f50ae6c523e0fab7f32546d31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-03Merge "Run ApacheXML tests in CtsLibcoreTestCases"Victor Chang
2023-07-03Merge "Import sources from xalan-tests xalan-j_2_7_3-rc10"Victor Chang
2023-07-02Run ApacheXML tests in CtsLibcoreTestCasesVictor Chang
Adds @Test to test methods that are passing on Android. The other tests need further to build / run / pass on Android. {} blocks are added into a few files to fix the SuspiciousIndentation Errorprone errors Bug: 283931833 Test: atest CtsLibcoreTestCases:org.apache.qetest Change-Id: Id68283b134bb5ca4fab2a9e3107b5a5bd16fc1dd
2023-07-01Import sources from xalan-tests xalan-j_2_7_3-rc10Victor Chang
Upstream source: https://github.com/apache/xalan-test The apache XML version in AOSP is 2.7.1. However, it's 16 years old. The xalan-j_2_7_3-rc10 version of test sources is used because there wasn't a clear manual how to build the tests in 2.7.1, and many bugs are fixed. However, org.apache.xalan.trace package in xalan-java has to be imported due to dependency from the tests. The commands: mkdir -p test/trace-src/org/apache/xalan/ cp -R $REPO/xalan-java/src/org/apache/xalan/trace/ test/trace-src/org/apache/xalan/ cp -R $REPO/xalan-test/java/ test/ cp -R $REPO/xalan-test/tests/ test/ cp -R $REPO/xalan-test/tools/ test/ find test/java/ -type f -name "*.class" -delete # remove the unnecessary .class files Bug: 283931833 Test: N/A Change-Id: I740301fd740923112d869dbdcdaf3171618427bc
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 7f0a82177e am: ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devTreehugger Robot
35ece4698b am: 0a0225c9c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2254754 Change-Id: I467a4020f47032eaadb1e7a1218dfd3e48136beb 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: 7f0a82177e am: ↵android-u-beta-1-gplTreehugger Robot
35ece4698b Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2254754 Change-Id: I2e7c04b9845a0c6f59389e2ab067bfebd1fef7bd 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: 7f0a82177emain-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2254754 Change-Id: Ibf56ec19697ef364301da1819d1e900e976c4898 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: I3800cc9e72229f3934d35da5ed8b95283e269b71
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 20b41e2d13 am: ↵Treehugger Robot
4c03a825f3 am: 5bf668ce22 am: 705a3f415e am: ea7fc9d633 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2138275 Change-Id: I0299f05a811583efe55aa685e026533a84e7bd1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 20b41e2d13 am: ↵Treehugger Robot
4c03a825f3 am: 5bf668ce22 am: 705a3f415e Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2138275 Change-Id: I8e5d9701dc5898748d4850e7aa5565840b866619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 20b41e2d13 am: ↵Treehugger Robot
4c03a825f3 am: 5bf668ce22 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2138275 Change-Id: Ib5c38449b455cd8bc885ca90478ab1dd20b6963b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 20b41e2d13 am: ↵Treehugger Robot
4c03a825f3 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2138275 Change-Id: I5a3072b8620863839b0cf34babcf84ea1be7e011 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 20b41e2d13Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/2138275 Change-Id: I85a7dc01636245000d7a5f8a624d4ba4e8861cce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning"Treehugger Robot
2022-06-29Downgrade SuspiciousIndentation lint to a warningCole Faust
Bug: 236431222 Test: Presubmits Change-Id: Ib2113535563920d4d4eaa10992668236c6f1e286
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0 ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-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_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-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-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Maria Uretsky
am: c7595b9b1e am: 11a39972e1 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: I338c60748464458a9a2ebbca519f04fdf70d3386
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0 ↵Maria Uretsky
am: c7595b9b1e Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: If64b9f87c7f4d02ed759053dfbfa5e76d4216507
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: Ia87b4edd99cd947d7202b946cea970d6608c4425
2021-12-08Merge "Update cpe for vulnerability scanners" am: 3477685cebandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: I91ad6a83ff829dd45736a66ef9bfd442aabea302
2021-12-08Merge "Update cpe for vulnerability scanners"Maria Uretsky
2021-12-08Update cpe for vulnerability scannersMaria Uretsky
Bug: http://b/201572953 Change-Id: Id51ecc4caa8da24ad7824f1111920511a97492b4
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Iccd8972f7bd865e1e6c425a3f00b5a0fed06101b
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-xml" am: f040053c21 ↵Bob Badour
am: 403f05763d am: 786d634338 am: 1b6b75b124 am: 6cde0c9a38 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1588523 Change-Id: Icd65ce32b02db400bc194ee339f06b97963047e2
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545ea am: db7f6c9797 ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseNicolas Geoffray
am: 8d34c1b66e am: 8d457a81c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia307328e02bb3cd77f5e6d1b572063b76c275c1a
2021-03-04Merge "Add min_sdk_version for ART module." am: b0743545ea am: db7f6c9797 ↵Nicolas Geoffray
am: 8d34c1b66e am: 8d457a81c7 Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1615859 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6bb3e881f5b3778e3942a9b2e3c20f99d5356df3