summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-04Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcdTreehugger Robot
Change-Id: I3757627503ebe83d58be5c6d0300cae1b0ecd093
2020-05-04Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7bandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I7500ae0bb5b4fe2cf915bfa065c6aad9df5319b2
2020-05-04Merge "Add METADATA to libbt: Apache2=NOTICE"Treehugger Robot
2020-05-01Add METADATA to libbt: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: If51f8b6607b19cecc50883f9cc7942a4c0eabed6
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: dbe4e03015 am: 40c99d7f10 -s ours am skip reason: subject contains skip directive Change-Id: I4ef6b2e2907bd467ba863434e49a89d22c480dd0
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: dbe4e03015 Change-Id: Ic67ea8b791c82badcc3075952389027627a0d9cd
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: I364b497da88b467c0744340bf9474181a4226781
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: df9a7ab05a -s ours am: 9cc49c4661 -s ours am: 485a31132e -s ours am skip reason: change_id I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220 with SHA1 0b0a9471f7 is in history Change-Id: I2a67ad215c0d527817d51842a7bb860f0ca8a2c0
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: df9a7ab05a -s ours am: 9cc49c4661 -s ours am skip reason: change_id I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220 with SHA1 0b0a9471f7 is in history Change-Id: Ibb24b60d86a6ae8e35315b59e26d4d369b2a83b6
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: df9a7ab05a -s ours am skip reason: change_id I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220 with SHA1 0b0a9471f7 is in history Change-Id: Ib1ce1c10f2c96c64e3f08a2882c3c0615a7dd172
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I940d6ac1e479efeb24aab9055b89af02564822db Merged-In: I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
feb4350cae -s ours am: a64bb35210 am: 1ac62f873a am: 5d6df3687f -s ours am skip reason: subject contains skip directive Change-Id: I8c4a03f36aa83c05c15fedb6c2ea0002b271cc82
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
feb4350cae -s ours am: a64bb35210 am: 1ac62f873a Change-Id: Ic8a351b70bc8ed642e4b0d0bb1da96c5eee94a61
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
feb4350cae -s ours am: a64bb35210 Change-Id: Idf733e51aaecacca3e789ceb7ec38b3df8e247b4
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: feb4350cae -s ours am skip reason: subject contains skip directive Change-Id: I7bbed851560bbdfd1076b533920434f95632eeda
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: e4d661aab1 am: 545f65767c -s ours am skip reason: subject contains skip directive Change-Id: Id9a281fd4ef47fb4e7dc957f81782debe9ef2304
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: e4d661aab1 Change-Id: Ib50cc6277079397c14581c73459cfda4f26562b5
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I2222421564952f18c3aa2736a91022d01b3caec2
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-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-releaseXin Li
am: b9bbab4ce2 -s ours am skip reason: subject contains skip directive Change-Id: I43758220d89c9ccaf45b7ee58d9242c0eb2fb346
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I5808e9054cb63d6b98afbb9b189a1e277744d3ed
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 566c7ceefa -s ours am: ↵Xin Li
39912798f9 -s ours am: 7745165de2 -s ours Change-Id: I6ffec35cd2afae36c9256ab68e6af2036d046c82
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: 566c7ceefa -s oursXin Li
am: 39912798f9 -s ours Change-Id: I29c2dd0c2bb53216c4b725dc14749a792e0cdc43
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: 566c7ceefa -s ours Change-Id: I3d1f7f256b8e46fcef8dcf60af8412f04762cb17
2018-12-10Merge "DO NOT MERGE"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Ibd6de9c43b5a4edd00369cb3f89757d6cdc66245
2018-11-20Merge "Remove obsolete device-specific files" am: 25d529fe8c am: 56fb84c586Dan Willemsen
am: c9a35fce8c Change-Id: Iefc880fe4df167ac96d734fba2a9f6989be03d19
2018-11-20Merge "Remove obsolete device-specific files" am: 25d529fe8cDan Willemsen
am: 56fb84c586 Change-Id: I12102fa6f4ce1109808bd62edd5554444a1b8498
2018-11-20Merge "Remove obsolete device-specific files"Dan Willemsen
am: 25d529fe8c Change-Id: Ifbed1f6286a61629a8c9c8a4be1f2552244cf1be
2018-11-20Merge "Remove obsolete device-specific files"android-wear-8.0.0_r2android-n-iot-release-ihome-igv1nougat-iot-releaseTreehugger Robot
2018-11-19Remove obsolete device-specific filesDan Willemsen
None of these devices are supported on this branch (or downstream branches) anymore. I'm not as familiar with the wear devices, so I didn't clean those up. Test: treehugger Change-Id: Ia2c5a63e61ebc2fb8b738cdbdf1f93e90b474b74
2018-09-27libbt: Add checks for fw file read errorsManoj Babulal
The fw file read may fail. This change adds checks to handle failure cases. Test: verified with fw file read fail case Bug: 110460199 Change-Id: If9ebd0db40d0d7f284dcca59b21433a36d1f1100
2018-08-08Merge "Merge Android Pie into master" am: a4319c3d6f am: 432482b571 am: ↵Xin Li
1a4d4d14a6 am: 7da2a206aa Change-Id: I673ddaca83e6bbaf1adc486d48d3aad41c3e5a57
2018-08-07Merge "Merge Android Pie into master" am: a4319c3d6f am: 432482b571Xin Li
am: 1a4d4d14a6 Change-Id: I94e1e89e00efed58f7586a8135288e82a3966b12
2018-08-07Merge "Merge Android Pie into master" am: a4319c3d6fandroid-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-fcsXin Li
am: 432482b571 Change-Id: I16abb95956ab4e624ab020850f7ee163281ed8c5
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: a4319c3d6f Change-Id: I8d9d55c1bca0168c278f857a80a1298d31190350
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: I1e2a54b8a8f207eb3ed6a947eccf66aade250f1c
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: d580e4b740Xin Li
am: 75fe0c1884 Change-Id: I4d0fbeaf5fe5ccd71f8b53f9e27e94e6948b711e
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: d580e4b740 Change-Id: I101cd2e26629be1027f68b6c75a694f619f2fce6
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I9392afd9577dc3f68c0f8dc42675ebeafe0205b5
2018-04-27Merge "Add new config for device catshark and catfish"android-build-team Robot
2018-03-04Snap for 4632767 from c120f3379f85c74b061bdaabdb56bb7a758369bd to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Iacbd9b77e15cf40af60ad4cc88821942b1d48eab
2018-02-28Add vnd_kingyo.txtandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devShohei Sakamoto
Change-Id: Icedc3df60983682dbc39e42675472f88f9aa22cd Signed-off-by: Shohei Sakamoto <sakamotos@casio.co.jp> (cherry picked from commit 647e44bad1a77e312f86ff6d6ea64e9392c44f10)
2018-02-18Snap for 4610834 from e2017d1ed0eb78b8530f5ab90b89c47f9141dc18 to pi-releaseandroid-build-team Robot
Change-Id: I0ae5e3af0737feb3f4611979388f55ebcf645216
2018-02-16Merge "libbt: fixup build errors when building the library under vndk." am: ↵Pierre Couillaud
5763f5e96e am: 93258f74b1 am: d89aaf8745 Change-Id: Ibde45229fd8a2fa779e409268fb7f34caea5ad01
2018-02-16Merge "libbt: fixup build errors when building the library under vndk." am: ↵Pierre Couillaud
5763f5e96e am: 93258f74b1 Change-Id: Ib4328d98b3c6ab830389a9e35704a6c21462c400
2018-02-16Merge "libbt: fixup build errors when building the library under vndk."Pierre Couillaud
am: 5763f5e96e Change-Id: I934075b08ee79e5b1a6eeed3ef1a36a5a417bf4a
2018-02-16Merge "libbt: fixup build errors when building the library under vndk."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 02:09:06 +0000