summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-06Merge "Fix include path for system/bt" am: 5b1cdfc242android-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-1Baligh Uddin
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1883334 Change-Id: I6832218b6da74b683b55c5651e3a4daea1394b5b
2021-11-06Merge "Fix include path for system/bt"Baligh Uddin
2021-11-06Fix include path for system/btBaligh Uddin
BUG: 196026708 Test: TH Merged-In: I7c316a80b6051136c7d47be0c1061463c66623f0 Merged-In: I367715ede438e5f762c14edb6fd208465a22909b Change-Id: I10e909788f51c3be8b65433048835bb582447b68
2021-03-15Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Roman Kiryanov
45a706e4fe am: 316b2ef507 am: 3e323802f9 Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1627760 Change-Id: If310970a0552b9f981dba534b299ca05201cb0dd
2021-03-15Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: ↵Roman Kiryanov
45a706e4fe am: 316b2ef507 Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1627760 Change-Id: Idb668857ae7c1456d303e320c40c2ed9cc437688
2021-03-15Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 45a706e4feandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Roman Kiryanov
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1627760 Change-Id: I95887ef274d7f4cc0e9b5a42fe4c3196d42ccac6
2021-03-15Merge "Use `ro.boot.qemu` to check if the device is an emulator"android-s-beta-2android-s-beta-1Roman Kiryanov
2021-03-10Use `ro.boot.qemu` to check if the device is an emulatorRoman Kiryanov
`ro.kernel.qemu` is deprecated. Bug: 182291166 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: I1689fe19bbe54358e9b858560c0e4174888a1aff
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f5d505f0e2 -s ↵Xin Li
ours am: 454deb6086 -s ours am skip reason: Change-Id Ia6c0b731fca112b9fba547ec8cef96b9d3e620db with SHA-1 805fac8a85 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1c6520ca8909b703c32e0e94368cbeb8a2280356
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt" am: ↵Bob Badour
a24d874b17 am: c3f844bf7a am: 985875b252 Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1588400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c60615b02e82287aa58410d984b9e34c50540f8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f5d505f0e2 -s oursXin Li
am skip reason: Change-Id Ia6c0b731fca112b9fba547ec8cef96b9d3e620db with SHA-1 805fac8a85 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I470ca46b0bec950078936131cbcf8ff42a6b386b
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ia6c0b731fca112b9fba547ec8cef96b9d3e620db Change-Id: I7b461e677d9afd6bed655d8b5c9bcb78a63dd4e7
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt" am: ↵Bob Badour
a24d874b17 am: c3f844bf7a Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1588400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I059d04287224389b1e32c67a98606ccad295ddb7
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt" am: a24d874b17Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1588400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5fa94cedf6772171375b260a096e0fb8b05c9e03
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbtBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie5436d0c41fe99d7dd7412e2f70c27e889264810
2020-11-25Mark ab/6881855 as merged am: a9c06ce907 am: 805fac8a85Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/13112980 Change-Id: Ib3617e5669d45830bc14eba0620a3585ad5761d5
2020-11-25Mark ab/6881855 as merged am: a9c06ce907Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/13112980 Change-Id: Ia6c0b731fca112b9fba547ec8cef96b9d3e620db
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I337ec1623e2122a7959f17df9f693dfc1945a3ba
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0e8d45a813 -s ours am: ↵Xin Li
f9d5cc4976 -s ours am: 90687d4149 -s ours am skip reason: Change-Id I148531457b8a1c6482868720492b7ae8016a8b7f with SHA-1 2ee29c6f0b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12795831 Change-Id: I72bbfe37e47022609f29312181047534439977ef
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0e8d45a813 -s ours am: ↵Xin Li
f9d5cc4976 -s ours am skip reason: Change-Id I148531457b8a1c6482868720492b7ae8016a8b7f with SHA-1 2ee29c6f0b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12795831 Change-Id: If879fe2d6058dc179910b9a934d0fe7c4092348d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0e8d45a813 -s oursXin Li
am skip reason: Change-Id I148531457b8a1c6482868720492b7ae8016a8b7f with SHA-1 2ee29c6f0b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12795831 Change-Id: Iaabc4b224393bfdfd5c20fbbe11ed4fb9422bf8b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I148531457b8a1c6482868720492b7ae8016a8b7f Change-Id: I5ad8c4b0ea8c046b975ea3e1f7807a27b00d340f
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 5bd0610be9 -s ours am: fd26cecfaf -s ours am: 49275b5bde -s ours am: ab487104f5 -s ours am skip reason: Change-Id I3757627503ebe83d58be5c6d0300cae1b0ecd093 with SHA-1 83f9b503f6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12469947 Change-Id: I1141cd5969967157737247d46a43fa44efda47e7
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 5bd0610be9 -s ours am: fd26cecfaf -s ours am: 49275b5bde -s ours am skip reason: Change-Id I3757627503ebe83d58be5c6d0300cae1b0ecd093 with SHA-1 83f9b503f6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12469947 Change-Id: I8e2da87e9ece84f9ec601e7483b2743f66b8efe5
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 5bd0610be9 -s ours am: fd26cecfaf -s ours am skip reason: Change-Id I3757627503ebe83d58be5c6d0300cae1b0ecd093 with SHA-1 83f9b503f6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12469947 Change-Id: I28be2219dc0d8823878d73f293f91b4b09f1e5d6
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 5bd0610be9 -s ours am skip reason: Change-Id I3757627503ebe83d58be5c6d0300cae1b0ecd093 with SHA-1 83f9b503f6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/12469947 Change-Id: I33cc62e55f43eff57860731ef88e4b4d42c138ff
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I3757627503ebe83d58be5c6d0300cae1b0ecd093 Change-Id: I18a2d434e0ab335ce26f6f3b6dca0000fe321ea9
2020-07-28Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7 am: 98990d7f90 ↵Treehugger Robot
am: 2ee29c6f0b am: ae1fc813b5 Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1360679 Change-Id: I7c2c79ce8c5da8a9ecc08031e0b18e57a60c7e4c
2020-07-28Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7 am: 98990d7f90 ↵Treehugger Robot
am: 2ee29c6f0b Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1360679 Change-Id: I02d90810c6aed51211a4b7e7d1b8b4125c391104
2020-07-28Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7 am: 98990d7f90Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1360679 Change-Id: I148531457b8a1c6482868720492b7ae8016a8b7f
2020-07-28Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1360679 Change-Id: Ie9616f1b47fc5921703f0d34ccd108d86b404774
2020-07-28Merge "LMP idle timeout update" am: 588bb9ac1dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1360679 Change-Id: I63a48651747b8c0a5650bcd83d738da4866a549f
2020-07-28Merge "LMP idle timeout update"Treehugger Robot
2020-07-27LMP idle timeout updatemullerf
Broadcom provided this patch to update the way the LPM idle timeout gets calculated. Currently, it is leading to a timeout that is too long. Updating with this patch to remove the multipliying constant when obtaining the value of timeout. Bug: 160981386 Signed-off-by: mullerf <mullerf@google.com> Change-Id: If451b8c9f76233f4ab307c5ce811e79b88643d76
2020-05-04Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcd ↵Treehugger Robot
am: 83f9b503f6 am: d447e8597c am: 3163e6d0a6 Change-Id: I424ed19ed79e74d843ca3d3caccc458fdd813506
2020-05-04Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcd ↵Treehugger Robot
am: 83f9b503f6 am: d447e8597c Change-Id: If206df201c4106756a304f44516cd1c2cd0fb2f9
2020-05-04Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcd ↵Treehugger Robot
am: 83f9b503f6 Change-Id: I0b077066323644a80ff56ac19d5518b04e848f43
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 04:36:30 +0000