aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-11[automerger skipped] Empty merge of ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-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-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: d4a61f3df3 -s ours am: 165fd896ec -s ours am skip reason: Merged-In I398485145e38ad68693bb39ed1581ff1daae07a0 with SHA-1 dc45e28d44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javaparser/+/16843139 Change-Id: I90b38e1b1655eeef60d6242bb09ddedbbd7f8ad3
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: d4a61f3df3 -s ours am skip reason: Merged-In I398485145e38ad68693bb39ed1581ff1daae07a0 with SHA-1 dc45e28d44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javaparser/+/16843139 Change-Id: Ibe7edc0cb9e5bcbe2961a11138e034887ea931b5
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I398485145e38ad68693bb39ed1581ff1daae07a0 Change-Id: I96dc17baa560ec7988dd2c2523058a962b9bb1da
2022-02-10Demote UnicodeInCode error to warning am: 2686dc2a30 am: 076e3e4cb7 am: ↵Cole Faust
9e7d0d1e16 am: 2d7c002692 Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1971863 Change-Id: I020c64e11df450fdd3ec71f2e813086f330b376a
2022-02-10Demote UnicodeInCode error to warning am: 2686dc2a30 am: 076e3e4cb7 am: ↵Cole Faust
9e7d0d1e16 Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1971863 Change-Id: Id9efff2050df7cbfd8e25eea03165b530a143032
2022-02-10Demote UnicodeInCode error to warning am: 2686dc2a30 am: 076e3e4cb7Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1971863 Change-Id: If4160392358ea48e203eb3910b8a83c5c62d00a6
2022-02-10Demote UnicodeInCode error to warning am: 2686dc2a30Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1971863 Change-Id: I05fba9f1be276c40afbf79e5d8ac67186732d310
2022-02-03Demote UnicodeInCode error to warningandroid-t-preview-2android-t-preview-1android-t-beta-3android-t-preview-1Cole Faust
Errorprone is being updated, and adds a check that errors out when there's unicode in java code. Javaparser has a method called thereIsSomeJSuchThatβequalAlphaJ, so demote the error to a warning. Also remove the OWNERS file because the only two people in it left Google. Bug: 190944875 Test: Presubmits Change-Id: I2ceb5b4c18c16354959b23f63ed6dda7ea85a8c0
2021-10-08[automerger skipped] Merge Android 12 am: 50a5d7f0b8 -s ours am: 22d8af430e ↵Xin Li
-s ours am: c78cc9dd30 -s ours am: 6ec86ae66f -s ours am: bb21290446 -s ours am skip reason: Merged-In Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 with SHA-1 6a30710e37 is already in history Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1847573 Change-Id: Ia48fa85217e18823d82a3ba5d865f93aecf7a511
2021-10-08[automerger skipped] Merge Android 12 am: 50a5d7f0b8 -s ours am: 22d8af430e ↵Xin Li
-s ours am: c78cc9dd30 -s ours am: 6ec86ae66f -s ours am skip reason: Merged-In Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 with SHA-1 6a30710e37 is already in history Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1847573 Change-Id: Ib7dbba0ad73f002c7a910254d74db1f9da885b92
2021-10-08[automerger skipped] Merge Android 12 am: 50a5d7f0b8 -s ours am: 22d8af430e ↵android-s-v2-beta-3android-s-qpr3-beta-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: c78cc9dd30 -s ours am skip reason: Merged-In Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 with SHA-1 6a30710e37 is already in history Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1847573 Change-Id: I9012ec27539719c1d0aa9fb103583b166d34a364
2021-10-08[automerger skipped] Merge Android 12 am: 50a5d7f0b8 -s ours am: 22d8af430e ↵Xin Li
-s ours am skip reason: Merged-In Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 with SHA-1 6a30710e37 is already in history Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1847573 Change-Id: Idb38fb025815b003ef3fd0d62663a4dad6bdd6ef
2021-10-08[automerger skipped] Merge Android 12 am: 50a5d7f0b8 -s oursXin Li
am skip reason: Merged-In Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 with SHA-1 6a30710e37 is already in history Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1847573 Change-Id: I961b4a02b4bd374cbbb7a7b8ba3c81461e38290e
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1 Change-Id: I71c21627b1f6673aac8a678df0fd94614a3011fb
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
6a30710e37 -s ours am: bcc5367791 -s ours am: b09d0f9822 -s ours am: a4db1306ee -s ours am skip reason: Merged-In I946ce46a785a6d867f3a7b488b9900804c9cef25 with SHA-1 7e34e30dd6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javaparser/+/15571834 Change-Id: Ie30d6bb2a8e661918849381ad00e0b0b460f2c35
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
6a30710e37 -s ours am: bcc5367791 -s ours am: b09d0f9822 -s ours am skip reason: Merged-In I946ce46a785a6d867f3a7b488b9900804c9cef25 with SHA-1 7e34e30dd6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javaparser/+/15571834 Change-Id: I0d96751dac54caa31e7b0e8a7aba5a82c6cf70e9
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
6a30710e37 -s ours am: bcc5367791 -s ours am skip reason: Merged-In I946ce46a785a6d867f3a7b488b9900804c9cef25 with SHA-1 7e34e30dd6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javaparser/+/15571834 Change-Id: I97a0c351bcd3433ed75cb3a5306382a2e75cd90a
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
6a30710e37 -s ours am skip reason: Merged-In I946ce46a785a6d867f3a7b488b9900804c9cef25 with SHA-1 7e34e30dd6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/javaparser/+/15571834 Change-Id: I0ef4ce321aa342a2ad4ff1f1f596c080a9ec1d59
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I946ce46a785a6d867f3a7b488b9900804c9cef25 Change-Id: Iec3882076f3e16d22f5fb8c207f8a2af5de8fae1
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ic678e395d7e4bb280134b51b79daf596e608c763
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/javaparser am: dc45e28d44 am: ↵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-releaseBob Badour
2044d731e3 am: 3de594b3f1 am: 7e34e30dd6 Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1588809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b2174225de724023db19b279590275e8ebeb871
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/javaparser am: dc45e28d44 am: ↵Bob Badour
2044d731e3 am: 3de594b3f1 am: 7e34e30dd6 Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1588809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6831b9026c4525e3893fe261d70a27945d09f10c
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/javaparser am: dc45e28d44 am: ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseBob Badour
2044d731e3 am: 3de594b3f1 Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1588809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I946ce46a785a6d867f3a7b488b9900804c9cef25
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/javaparser am: dc45e28d44 am: ↵Bob Badour
2044d731e3 Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1588809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I532d57d8450ce695580af8f7eb089ae6e4831ecd
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/javaparser am: dc45e28d44android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/javaparser/+/1588809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6992669eaf3edfd3a073e95e548d150e67c524c5
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/javaparserandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I398485145e38ad68693bb39ed1581ff1daae07a0
2020-09-25Revert "Revert "Add javaparser-symbol-solver.""Hai Zhang
This reverts commit 3c9e1e2751398b0066bd6fbaa651924440938729. Reason for revert: Transient build failure due to automerger delay for ag/12691508. Change-Id: I1b4392090a66abd0d244f6e42297b1903fec0989
2020-09-25Revert "Add javaparser-symbol-solver."Lev Proleev
This reverts commit 9e0ed40dc72a3a13371eac016492745c58322d34. Reason for revert: breaks build on git_master-without-vendor b/169394973 Change-Id: I5e41a357644f4b33d010a5d65a4b489819854c74
2020-09-24Add javaparser-symbol-solver.Hai Zhang
Test: m javaparser-symbol-solver Change-Id: I1a03e80e786fcda67a2847d41673c1709236ef3c
2020-04-24Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88fa am: ↵Bob Badour
ae62283861 am: 1797bb5b39 am: f52e66d3d9 am: 11020a86d4 Change-Id: Ie1212a1eafd6b51af276f4947519fa8d22a3ce4d
2020-04-24Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88fa am: ↵Bob Badour
ae62283861 am: 1797bb5b39 am: f52e66d3d9 Change-Id: I740bbe9b05263698577c1ee022498e5be444802d
2020-04-24Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88fa am: ↵Bob Badour
ae62283861 am: 1797bb5b39 Change-Id: I16bfe0bf2261d93cf43873c7ab0a9a30c73d5c68
2020-04-24Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88fa am: ae62283861Bob Badour
Change-Id: I6aeee962233064fa0ba5c1c0d4ff2d68a77323b0
2020-04-24Add license type: LGPL+GPL are RESTRICTED licenses am: 6ef29d88faandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I4a1f8ed3ece21243aa2a6c2823d6fa07d739d171
2020-04-23Add license type: LGPL+GPL are RESTRICTED licensesBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Idc3930e762bda368687a0a0cd0494809311ce944
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 1bace98412 am: 49d8afb799 -s ours am skip reason: subject contains skip directive Change-Id: I609e0321d028deaa75b2365e1e41e48e2aa17b18
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 1bace98412 Change-Id: I3e77b40027a40b410446dad56ad1b24a1aed440a
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I3907f111f33f7d3f9b9bba1b7db8bd3451f3785f
2019-10-11Remove reference to java.xml.ws.annotation. am: 188dc7001f am: c3aaa4c6f2 ↵Pete Gillin
am: 87cdbb0795 am: ebdb07b40e Change-Id: Iccf456932f362cd27fa3d3be9cf509a1b66e6071
2019-10-11Remove reference to java.xml.ws.annotation. am: 188dc7001f am: c3aaa4c6f2Pete Gillin
am: 87cdbb0795 Change-Id: I4427e436970114680903e30133479e5578dba6a8
2019-10-11Remove reference to java.xml.ws.annotation. am: 188dc7001fPete Gillin
am: c3aaa4c6f2 Change-Id: Iced8cf491c53aa2ad129861d0d4e2150f6b85d1a
2019-10-11Remove reference to java.xml.ws.annotation.Pete Gillin
am: 188dc7001f Change-Id: Ibc20e729fb3e3b295a44a2d7989f01674752c69c
2019-10-11Remove reference to java.xml.ws.annotation.Pete Gillin
This is not needed any more, because the code was upgraded to a newer version from upstream which migrated away from using javax.annotation.Generated (see https://r.android.com/1099815). The redundant --add-modules option breaks builds with -source 9 -target 9 (so the Java module system is enabled) using OpenJDK 11 (which removes this module). In other words, the third of the 'Test' lines below fails without this change and succeeds with it. Test: make javaparser Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make javaparser Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=true make javaparser Test: . $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/runTest.sh (in downstream branch) Bug: 131683177 Change-Id: Id0e6adcb4ba56b0d15f904891c5fda655953f4f3
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 277f31e141 -s ours am: 9eb8dd9805 -s ours am: 0c58e5c4dc -s ours am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history Change-Id: Idb33808b5a099e4e5ced7ff4930641871276cdbd
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 277f31e141 -s ours am: 9eb8dd9805 -s ours am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history Change-Id: Id0abc395dd402e233e10b7ee8f7417370dd9e7b7
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 277f31e141 -s ours am skip reason: change_id I3642789b90cb5e10145e07f8fc44d7cd688bfad2 with SHA1 cb5c455ed1 is in history Change-Id: I9044f99ac8c6f9771e92a9f6f263b1ba13343641
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I6d9010558228237cb51d8f8d69c527d061df267b Merged-In: I3642789b90cb5e10145e07f8fc44d7cd688bfad2
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
cb5c455ed1 -s ours am: b75f646c5c am: 19c906e43e am: 6fe394784d -s ours am skip reason: subject contains skip directive Change-Id: Iea75d2296ba716f9ab662b872a76754fb8243a60
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
cb5c455ed1 -s ours am: b75f646c5c am: 19c906e43e Change-Id: I77d43a48f4301812332c0241bc3a49385521e447
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
cb5c455ed1 -s ours am: b75f646c5c Change-Id: Ie9e93d2df7ca12f1c851af863c881852cb762064
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 09:21:18 +0000