summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-08[automerger skipped] Merge "Fix include path for system/bt" am: 5b1cdfc242 ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-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-scheduling-releaseandroid13-mainline-networking-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-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Baligh Uddin
am: 13069fbdb9 -s ours am: 0b241f4638 -s ours am: 7fcbff7ae2 -s ours am: fdf24bf229 -s ours am skip reason: Merged-In I7c316a80b6051136c7d47be0c1061463c66623f0 with SHA-1 afc54f7ce4 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1883334 Change-Id: Ic623bf068b5fc70ffa434a7417bb5517b2d02140
2021-11-08[automerger skipped] Fix include path for system/bt am: afc54f7ce4 am: ↵Baligh Uddin
7e6e02792f am: 51c917a31f -s ours am skip reason: Merged-In I367715ede438e5f762c14edb6fd208465a22909b with SHA-1 06db251ab3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/16203021 Change-Id: I7f3a3dbfa053e6fede38c14190c8089346c23b52
2021-11-06[automerger skipped] Merge "Fix include path for system/bt" am: 5b1cdfc242 ↵Baligh Uddin
am: 13069fbdb9 -s ours am: 0b241f4638 -s ours am: 7fcbff7ae2 -s ours am skip reason: Merged-In I7c316a80b6051136c7d47be0c1061463c66623f0 with SHA-1 afc54f7ce4 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1883334 Change-Id: I67fac721182f961d5a32817da27ec68887282c1e
2021-11-06[automerger skipped] Merge "Fix include path for system/bt" am: 5b1cdfc242 ↵Baligh Uddin
am: 13069fbdb9 -s ours am: 0b241f4638 -s ours am skip reason: Merged-In I7c316a80b6051136c7d47be0c1061463c66623f0 with SHA-1 afc54f7ce4 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1883334 Change-Id: I647ff74f29c603df26c33513b80c89ccbe2ff46c
2021-11-06[automerger skipped] Merge "Fix include path for system/bt" am: 5b1cdfc242 ↵Baligh Uddin
am: 13069fbdb9 -s ours am skip reason: Merged-In I7c316a80b6051136c7d47be0c1061463c66623f0 with SHA-1 afc54f7ce4 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1883334 Change-Id: I6bff988c9bf989e08033da77f80e035b4e79876c
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-11-06Fix include path for system/bt am: afc54f7ce4 am: 7e6e02792fBaligh Uddin
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/16203021 Change-Id: I64275a875894fe8af999938754095d6bde7dc81b
2021-11-06Fix include path for system/bt am: afc54f7ce4Baligh Uddin
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/16203021 Change-Id: Ie617440a19c51694d2abf732b02634151cd4da5a
2021-11-06Fix include path for system/btBaligh Uddin
BUG: 196026708 Test: TH Merged-In: I367715ede438e5f762c14edb6fd208465a22909b Change-Id: I7c316a80b6051136c7d47be0c1061463c66623f0
2021-10-21Fix include path for system/btBaligh Uddin
BUG: 196026708 Test: TH Change-Id: I367715ede438e5f762c14edb6fd208465a22909b
2021-03-15Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: ↵Roman Kiryanov
45a706e4fe am: 316b2ef507 am: 3e323802f9 am: 76102037da Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1627760 Change-Id: If59e65c8d78b038c0daa962d5281ed9506ce8c2f
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: a365afe785 -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: I49dae0fad6e30bcd5ec8f420f3470fefd614bc73
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt" am: ↵Bob Badour
a24d874b17 am: c3f844bf7a am: 985875b252 am: 6bacfd0770 Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/1588400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e8ae8c7f7d21cd88d3b7d7e298badf91a54316e
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