summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-04Merge "Automatic documentation for "@Column" annotation."android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseJeff Sharkey
2019-02-25Merge "Update doclava to use @since tags from comments."Dirk Dougherty
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 19d78dff84 Change-Id: Idba0656aadce92de95c8989784151ba833f6ab2b
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ie29c762723366566a30a9e1436b51fec7deca4e3
2019-02-23Update doclava to use @since tags from comments.Dirk Dougherty
Metalava is now generating the API stubs and handles the calculation of when APIs were introduced and deprecated. It now directly adds this info to each APIs comment using the tags @apiSince and @deprecatedSince. This cl enables the doclava API reference generator to extract these tags and output them to the docs. Requires passing -metalavaApiSince into the doclava build. bug: 125939989 Test: make ds-docs Change-Id: I1a6c04a3e05dd1dc74ccdaf81ec45b52a40f55fc
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.13androidx-jetifier-releaseXin Li
Bug: 120848293 Change-Id: Ied6b5afeaecf861153d9294713c12b1ea6303cf9
2019-02-15Automatic documentation for "@Column" annotation.Jeff Sharkey
We have various "contract" classes across the OS which describe the columns that are available for insert(), update(), and query() when working with ContentProviders. To help ensure that the underlying providers fully support the API contracts being made, this change defines a new "@Column" annotation which describes the underlying data type. These annotations can then be used by the ContentProvider implementations internally to ensure that they're fully meeting the API contracts being made. Bug: 120429729 Test: manual Change-Id: Iffeb5fce4a1186e0b4aa3424ecb69a34f6607c21
2019-02-15Merge "Update doclava owners"Tor Norbye
2019-02-15Merge "Add @deprecatedSince and @apiSince as knowns tags" am: f094924d25 am: ↵Tor Norbye
0b19b44d8f am: 6cb8bd90b6 Change-Id: Iae8c7a08630d0c0cc19df14102f08b930887f537
2019-02-15Merge "Add @deprecatedSince and @apiSince as knowns tags" am: f094924d25Tor Norbye
am: 0b19b44d8f Change-Id: I005f51c3f1f074ba9f05419f1b28b8001e6e4e37
2019-02-15Merge "Add @deprecatedSince and @apiSince as knowns tags"Tor Norbye
am: f094924d25 Change-Id: Iad21e75ee3c93c4e30ac9dbba4305b828cf4d96a
2019-02-15Merge "Add @deprecatedSince and @apiSince as knowns tags"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTor Norbye
2019-02-14Update doclava ownersTor Norbye
Test: gerrit uploader Change-Id: I761ae5c4f66a256132f93f455afcc8c69ffc2b28
2019-02-13Add @deprecatedSince and @apiSince as knowns tagsTor Norbye
Test: make docs Change-Id: If9cca139dfd36bc715ee8040cf435010cc21470d
2019-01-15Merge "Add default code reviewers into OWNERS" am: ec7a9ad9e9 am: c67e748787Chih-hung Hsieh
am: bab853de0d Change-Id: I4fd94fa68009243513a363bb91cb74f7020f1468
2019-01-15Merge "Add default code reviewers into OWNERS" am: ec7a9ad9e9Chih-hung Hsieh
am: c67e748787 Change-Id: I52c38f220ba851371170ed8901979a055060ac87
2019-01-15Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: ec7a9ad9e9 Change-Id: I6d32bbd5e9097e14c2036a1c113c80816509600c
2019-01-15Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-15Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Idefb7d11622e51386c4ee5f5e773ea2c5ff964ca
2018-12-06[automerger skipped] Merge "DO NOT MERGE" am: 868494cd34 -s ours am: ↵The Android Open Source Project
7322c544bc -s ours am: 116c1ca6c4 -s ours Change-Id: I92f0ba00297dbf5ed7c5ed02834679970f60a7af
2018-12-06[automerger skipped] Merge "DO NOT MERGE" am: 868494cd34 -s oursThe Android Open Source Project
am: 7322c544bc -s ours Change-Id: I4a004e7a51b6f096ba188999fc1676aa468be6f2
2018-12-06[automerger skipped] Merge "DO NOT MERGE"The Android Open Source Project
am: 868494cd34 -s ours Change-Id: I0a594fcb56b8c75edc2e4ac13bcbe769ad836f34
2018-12-07Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-06DO NOT MERGEThe Android Open Source Project
Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I986e1aeccdbf686d873f849b1a28197c33df79b6
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-platform-releasepie-cuttlefish-testingBill Yi
Change-Id: Iaa0dc1969220f7106257b342e2480752653ddfc2
2018-11-06Merge "Add a version of doclava without guava built in" am: 25ef586c68 am: ↵Julien Desprez
3a4f3ae6fc am: 825f1ad984 Change-Id: I81b4f2ca86260da06497511be42ccd1b090da4b9
2018-11-06Merge "Add a version of doclava without guava built in" am: 25ef586c68Julien Desprez
am: 3a4f3ae6fc Change-Id: I887adca13424d0d0e1a52fa29a657ec1002380ae
2018-11-06Merge "Add a version of doclava without guava built in"Julien Desprez
am: 25ef586c68 Change-Id: Ib5a033e8bfe72b78aba1cbc8b3055fe0151564ef
2018-11-06Merge "Add a version of doclava without guava built in"android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseJulien Desprez
2018-11-05Add a version of doclava without guava built inJulien Desprez
Test: make cts Bug: 118297021 Change-Id: Iab0bde59a88f68422a9c25d3b12298f755ecef82
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 473f1e058a -s ours am: c805ec43b9 -s ours am: a511175309 -s ours Change-Id: I359abbe4fbd02f4b88c75986ddec249a2b108a1c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 473f1e058a -s ours am: c805ec43b9 -s ours Change-Id: I9b52843599d8f1d4153ec356e9dd835408762238
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 473f1e058a -s ours Change-Id: Id829f21ad612f9220989b61ea787b82bdd307b32
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: Id6f5dd4a91f748267d0dcfc441f8a72273f1321d
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: fd5b46b382 -s ours am: 2a085778a8 -s ours Change-Id: I456d93b51270b2a44480d396e7b6052d7875effb
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: fd5b46b382 -s ours Change-Id: Ic0c4e036697c7fc8da75711d4aefeda656371de6
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I0ba8374cef609691a855b348d3c01b5a783daf1a
2018-10-19Merge pi-dr1-dev to aosp-master am: 37157143f6 am: e7746cb0d3Bill Yi
am: a089a8a042 Change-Id: I4a95f6541f3e054fc09f7d0d7d2c71c6870c2643
2018-10-19Merge pi-dr1-dev to aosp-master am: 37157143f6Bill Yi
am: e7746cb0d3 Change-Id: I6d1cf594504030183f8c04a6002695efb4ef4678
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
am: 37157143f6 Change-Id: I7e84e05ac3e6f7f150cba9f24f057ae009ea9a0d
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
Change-Id: Icdac6cf2beaec618104a96ddfec051477bdfba6f
2018-10-17Try fixing expandable issue.Jeff Sharkey
Bug: 78064247 Test: none Change-Id: Ic43172d135b26698192144b6c6f8e070bb318886
2018-10-02Merge "Prevent droiddoc from printing running time." am: 932d50a32c am: ↵Nan Zhang
e544dfaefe am: 874d7d73a4 Change-Id: Ia9270f5c4f942373a47d01f773cc66b328ee3420
2018-10-02Merge "Prevent droiddoc from printing running time." am: 932d50a32cNan Zhang
am: e544dfaefe Change-Id: I1d40caa00425833d1bd66a5c22d76ed80a8d860f
2018-10-02Merge "Prevent droiddoc from printing running time."pie-tempNan Zhang
am: 932d50a32c Change-Id: If2e44787e264e81c37874733075a896c9ef3607b
2018-10-03Merge "Prevent droiddoc from printing running time."android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-10-02Prevent droiddoc from printing running time.Nan Zhang
Test: m -j docs; Bug: b/116874473 Change-Id: I4b6bac1225a2a7cc8b9b6ec46bd5362436466843
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-master am: 5daf0236faXin Li
am: 00ef7549c9 Change-Id: I09c412266796da7c36462b8d66ccdd5b52391936
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
am: 5daf0236fa Change-Id: Ic3b15b13167b8932a3998634c5b9705d123f2468
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
Bug: 112535855 Change-Id: I890e873e956d67fcc7decc9fc026c7c76c036fea
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 11:46:36 +0000