summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-26Rename connected/disconnected callbacks to conform API guidelines am: 42c4c4b2b1android-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-releaseNikita Iashchenko
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/14718075 Change-Id: I2655439094aee1df75ce5e7da8cf40c631a1f74d
2021-05-26Rename connected/disconnected callbacks to conform API guidelinesandroid-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devNikita Iashchenko
Bug: 184654804 Bug: 154796679 Test: m update-api Merged-In: Idc1ba677bad909d35d7879492a752d427cde896d Change-Id: Idc1ba677bad909d35d7879492a752d427cde896d
2021-02-22Merge "Delete some legacy AndroidTest.xml config" am: 95fbcb6a79 am: ↵Treehugger Robot
582ed1ba80 am: ace914358a am: a7d5a621ea Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1598337 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1f014bd6686af59bf9933286b8a4182002b8633a
2021-02-22Merge "Delete some legacy AndroidTest.xml config" am: 95fbcb6a79 am: ↵Treehugger Robot
582ed1ba80 am: ace914358a Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1598337 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7136ddafdb85b14a16a85109942a497b3d209241
2021-02-22Merge "Delete some legacy AndroidTest.xml config" am: 95fbcb6a79 am: 582ed1ba80Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1598337 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b39219aa20ed7e4b4353a9703d872915b62fd1b
2021-02-22Merge "Delete some legacy AndroidTest.xml config" am: 95fbcb6a79android-s-beta-2android-s-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1598337 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iddefd139b0d3faa37addbeb01aa4a872f27ea165
2021-02-22Merge "Delete some legacy AndroidTest.xml config"Treehugger Robot
2021-02-22Delete some legacy AndroidTest.xml configJulien Desprez
It seems to import a config from CTS that doesn't exists since N. Change-Id: I5d070b7e484fef6088008b2c836833ae04c65687 Test: presubmit Bug: None
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e6d879d48c -s ↵Xin Li
ours am: 6805237a2f -s ours am: eddc3c8b01 -s ours am skip reason: Change-Id I7c47a8719810947e97c5760bab6e8265141b4840 with SHA-1 da6c4c5b35 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia56efe4d7c234608bbf04ac6198ff2dece4d879c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e6d879d48c -s ↵Xin Li
ours am: 6805237a2f -s ours am skip reason: Change-Id I7c47a8719810947e97c5760bab6e8265141b4840 with SHA-1 da6c4c5b35 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4014d6edab2fb418cc000df894ea9850558a3c6b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e6d879d48c -s oursXin Li
am skip reason: Change-Id I7c47a8719810947e97c5760bab6e8265141b4840 with SHA-1 da6c4c5b35 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5488d3c22bee70d8a537aa48d17e80650a2be5a
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I7c47a8719810947e97c5760bab6e8265141b4840 Change-Id: I2c862b7ccede28a52510a253e242209eed1ad755
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony" am: ↵Bob Badour
c07f62c472 am: 98cd96c3eb am: 77c0dc09d2 am: f1d4a02357 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1588867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id356417fcfcca8940c44fc58b49f93039284fe9f
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony" am: ↵Bob Badour
c07f62c472 am: 98cd96c3eb am: 77c0dc09d2 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1588867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9653feec750859b3084f37c80693a3bec647d43
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony" am: ↵Bob Badour
c07f62c472 am: 98cd96c3eb Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1588867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9660fc2ea4722afaff4fc4281cee51c858cd61b9
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony" am: c07f62c472Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1588867 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc678d3e1c9b6447e58766741a7abc6514ae0c69
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmony"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/apache-harmonyBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp jdwp/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1a0ca88f23cd028f898bc2f221f8fdb346a5d3a9
2020-11-24Mark ab/6881855 as merged am: 0d3ae0b108 am: da6c4c5b35Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/13111888 Change-Id: I4086f61bb16300fd5f6cc465b6aba24d42785d9b
2020-11-24Mark ab/6881855 as merged am: 0d3ae0b108Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/13111888 Change-Id: I7c47a8719810947e97c5760bab6e8265141b4840
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I66c64ea6ac184da2c65f2e10d71f2ce66e811d6c
2020-10-15Merge "Allow modules to be added to ART sdk" am: 6bae78fd14 am: e9edd4e2cd ↵Paul Duffin
am: 39dcdc98cf am: cb17d6958e Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1399203 Change-Id: I189e7ed70598c7cf579192b2cf3f0b1cb466a516
2020-10-15Merge "Allow modules to be added to ART sdk" am: 6bae78fd14 am: e9edd4e2cd ↵Paul Duffin
am: 39dcdc98cf Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1399203 Change-Id: Ia1f02beda982863dd5490eaec78e2f34c0fd125c
2020-10-15Merge "Allow modules to be added to ART sdk" am: 6bae78fd14 am: e9edd4e2cdPaul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1399203 Change-Id: I776f18fbd14ab5a24d8531804667e716159b6404
2020-10-15Merge "Allow modules to be added to ART sdk" am: 6bae78fd14Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1399203 Change-Id: Ib63655ccf97cbe12fafd972a6c9ed416daad57dd
2020-10-15Merge "Allow modules to be added to ART sdk"Paul Duffin
2020-10-13Allow modules to be added to ART sdkPaul Duffin
Test: m nothing Change-Id: Iee2a1652250fa97a0444b2b5d4170279a7482a9d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7676a35755 -s ours am: ↵Xin Li
1d56e079ed -s ours am: 189e59b905 -s ours am skip reason: Change-Id I4c758403bb74a0d51e56142590872903216ae8b9 with SHA-1 43d3ed5786 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12796482 Change-Id: I8387569a80955e9a6ee3de1d758ecbbd2b7d64f5
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7676a35755 -s ours am: ↵Xin Li
1d56e079ed -s ours am skip reason: Change-Id I4c758403bb74a0d51e56142590872903216ae8b9 with SHA-1 43d3ed5786 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12796482 Change-Id: Iccae73f4071766917adb59f12d16f61994233ab4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7676a35755 -s oursXin Li
am skip reason: Change-Id I4c758403bb74a0d51e56142590872903216ae8b9 with SHA-1 43d3ed5786 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12796482 Change-Id: Ibf3e8c9f798d5297ec2f6e0b03d4b68538bc34a7
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I4c758403bb74a0d51e56142590872903216ae8b9 Change-Id: I5a9e7bd0bace0b6687fee3d676ccf8805a95eab9
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: bc1d06e182 -s ours am: ac1ce28670 -s ours am: 0b48ff77d8 -s ours am: 2fa24bdf6c -s ours am skip reason: Change-Id Idecf06ef087cc2ec59000674c57f81f0d8aa9b77 with SHA-1 a89dff306d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12469887 Change-Id: I2954654fe4ee4c197392e5ae164b7aff56e3e334
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: bc1d06e182 -s ours am: ac1ce28670 -s ours am: 0b48ff77d8 -s ours am skip reason: Change-Id Idecf06ef087cc2ec59000674c57f81f0d8aa9b77 with SHA-1 a89dff306d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12469887 Change-Id: I0b12b7ebf9a153e9a1bddc7bd93239fce2bce054
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: bc1d06e182 -s ours am: ac1ce28670 -s ours am skip reason: Change-Id Idecf06ef087cc2ec59000674c57f81f0d8aa9b77 with SHA-1 a89dff306d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12469887 Change-Id: Ifab02c900477e6ea4aa2f9dcabcea6c1787d64dd
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: bc1d06e182 -s ours am skip reason: Change-Id Idecf06ef087cc2ec59000674c57f81f0d8aa9b77 with SHA-1 a89dff306d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/12469887 Change-Id: Ifae2981866ad1f1f61cb3ce7a311da6da927bdf9
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: Idecf06ef087cc2ec59000674c57f81f0d8aa9b77 Change-Id: I64706b26d31d3063416eae7b6fd032a1788f061f
2020-07-31Merge "Refresh OWNERS file" am: c515711c52 am: 30719bd409 am: f66d932b38 am: ↵Orion Hodson
43d3ed5786 am: 1e49350395 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1376378 Change-Id: I5ab7cecc224f72141737831c3aa58619339a17c3
2020-07-31Merge "Refresh OWNERS file" am: c515711c52 am: 30719bd409 am: f66d932b38 am: ↵Orion Hodson
43d3ed5786 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1376378 Change-Id: I9b43881e2538a50b53a108a5205ecd01e0208c79
2020-07-30Merge "Refresh OWNERS file" am: c515711c52 am: 30719bd409 am: f66d932b38Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1376378 Change-Id: I4c758403bb74a0d51e56142590872903216ae8b9
2020-07-30Merge "Refresh OWNERS file" am: c515711c52 am: 30719bd409Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1376378 Change-Id: I75adde5992a6a76701eaca69f609a31ad9e71d4f
2020-07-30Merge "Refresh OWNERS file" am: c515711c52Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1376378 Change-Id: I4b776e959da5cc376d3fe15c2b787b49c4386f74
2020-07-30Merge "Refresh OWNERS file"Orion Hodson
2020-07-29Refresh OWNERS fileOrion Hodson
Test: build/make/tools/checkowners.py -c -v external/apache-harmony/OWNERS Change-Id: Ia2faeeb13a5d07ff4fc3c9caeee24d5c3d78a4fd
2020-07-28Merge "Inclusive Language Fixit: Replace dummy with fake" am: a55f1246f6 am: ↵Paul Duffin
39ee122a6c am: ae3a3c6aae am: 9282591cd4 am: 10afddf0ae Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1373176 Change-Id: If387f9701ed3f2396136cfc019a5fe004511ebcd
2020-07-28Merge "Inclusive Language Fixit: Replace dummy with fake" am: a55f1246f6 am: ↵Paul Duffin
39ee122a6c am: ae3a3c6aae am: 9282591cd4 Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1373176 Change-Id: I32b9675333558e78a9a189a24b6c537c4e72a794
2020-07-28Merge "Inclusive Language Fixit: Replace dummy with fake" am: a55f1246f6 am: ↵Paul Duffin
39ee122a6c am: ae3a3c6aae Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1373176 Change-Id: I1aa9cddc8ed417b59b7d34d6b8f66fc3dd96c7fa
2020-07-28Merge "Inclusive Language Fixit: Replace dummy with fake" am: a55f1246f6 am: ↵Paul Duffin
39ee122a6c Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1373176 Change-Id: I3383efe149c7266d9fdeea1e412e7208f31bcad7
2020-07-28Merge "Inclusive Language Fixit: Replace dummy with fake" am: a55f1246f6Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1373176 Change-Id: I91a68106ea4bf367705875e96aa87e88f9b1f589
2020-07-28Merge "Inclusive Language Fixit: Replace dummy with fake"Paul Duffin
2020-07-27Inclusive Language Fixit: Replace dummy with fakePaul Duffin
Bug: 162205877 Test: m java Change-Id: I6b9d872f742bfae78cd9a345aef035b1a7700f6d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 00:55:39 +0000