OSDN Git Service
TreeHugger Robot [Fri, 13 Apr 2018 18:34:30 +0000 (18:34 +0000)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev
Hansong Zhang [Fri, 13 Apr 2018 17:46:21 +0000 (10:46 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d am:
05a3ab6e80
am:
79a34c4d18
Change-Id: I6090948de2e63f35f81c5705889c0c81ac536350
Hansong Zhang [Fri, 13 Apr 2018 17:45:51 +0000 (10:45 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a am:
da1f87776d
am:
8634a90de6 -s ours
Change-Id: Ie55d6956623496dddc558a1bf87758b183a83e05
Hansong Zhang [Fri, 13 Apr 2018 17:38:26 +0000 (10:38 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d
am:
05a3ab6e80
Change-Id: I2e0718c75916c152eddee35c3b3a354f2fa9fb66
Hansong Zhang [Fri, 13 Apr 2018 17:38:00 +0000 (10:38 -0700)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a
am:
da1f87776d
Change-Id: I9a2e670b407f2fff7db97e3b3584046c4238aeb5
Hansong Zhang [Fri, 13 Apr 2018 17:32:01 +0000 (10:32 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev
am:
ca2db5620d
Change-Id: I1965625083c5f2085d4fccc75b21bf3e42c7ed9b
Hansong Zhang [Fri, 13 Apr 2018 17:31:28 +0000 (10:31 -0700)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac
am:
167165f72a
Change-Id: I1cd29964585f19318cded3a3342462bb5e6e19a1
TreeHugger Robot [Fri, 13 Apr 2018 17:14:22 +0000 (17:14 +0000)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev
* changes:
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b am:
a71087b592 skipped:
b1997290c7
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b am:
a71087b592
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e
DO NOT MERGE Add bounds check for BNEP_Write
Hansong Zhang [Thu, 12 Apr 2018 18:45:03 +0000 (11:45 -0700)]
Initialize local variable in gatts_process_read_by_type_req
Bug:
73125709
Test: manual
Change-Id: Iac13d92c987e5bed4376ec994bb2a60cedf6c5db
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:47 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac
Change-Id: Iadaf7d813e39e9fe985e7de8033cc806197c6a5d
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:41 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206
Change-Id: I8a62ca358bcdaf54c499e577d24a11d3fdbeaa5b
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:34 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1
Change-Id: I36031cc6bb8b558654ba7c89c67c7850d27beb86
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:28 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe
Change-Id: I3971fde63282accd19ef5904ca63a63b6935b5f2
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:22 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44
Change-Id: Ide45620dc9fdb923c6c400872dcb9fb9df4be232
Hansong Zhang [Thu, 12 Apr 2018 19:23:36 +0000 (12:23 -0700)]
DO NOT MERGE Add bounds check for BNEP_Write
Bug:
74947856
Test: manual
Change-Id: I19d9dee53b9cac800c66becef4861e4ad9602bdf
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:15 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b am:
a71087b592 skipped:
b1997290c7
Change-Id: I871348e6e073476d585bad9568c436837bfd0ce4
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:14 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b am:
a71087b592
Change-Id: I8d621c9be4bfcb2e28b2c19cd21c3a3bd5ca5014
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:12 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b
Change-Id: If71a295fe311805a65c97d76ca3706ab1b2bff1e
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:11 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf
Change-Id: Ic2a72f5d67e71328725ff1848fba3a1653841f75
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:10 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef
Change-Id: I15b5fb1a459941fbb01d2c35f0bce72421ffd79a
Android Build Merger (Role) [Thu, 12 Apr 2018 19:25:03 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442
Change-Id: I8e2c1ec223c8a8657607ffaf7303c4e8fbd624d8
Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:57 +0000 (19:24 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1
Change-Id: Ic76fd58c1524bc09fd0c1c536306fbd2f3b0120a
Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:51 +0000 (19:24 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20
Change-Id: Ie83d15c1bad2a38c4193771848f96e88c23a11e9
Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:45 +0000 (19:24 +0000)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e
Change-Id: Ib83180b9764bd61ea32525b71446e24018cb3be0
Hansong Zhang [Thu, 12 Apr 2018 19:23:36 +0000 (12:23 -0700)]
DO NOT MERGE Add bounds check for BNEP_Write
Bug:
74947856
Test: manual
Change-Id: I19d9dee53b9cac800c66becef4861e4ad9602bdf
Stanley Tng [Mon, 19 Mar 2018 19:48:04 +0000 (12:48 -0700)]
Pass new LE CoC min_ce/max_ce parameters to native stack
Add new test connection event (ce) parameters, min_ce and max_ce, to
the SL4A tests for LE Connection-oriented Channel (CoC) feature.
Test: Run cmd: act.py -c $MY_SL4A_CONFIG -tc BleCoc2ConnTest
Bug:
77528723
Change-Id: Ifea040f0eb105f89539e6b74f5c2edc76147a065
(cherry picked from commit
a0b984e80a9522b7d7e6dca4246b9b56c9ae0ab7)
Jack He [Mon, 2 Apr 2018 20:04:58 +0000 (13:04 -0700)]
Metrics: Add metrics item for profile usage
Item A: Add messages to log profile connections
* Add ProfileUsageStats message in bluetooth.proto
* Add BluetoothProfileId enum to represent each profile
* Add num_times_connected item to log how many times a profile is
connected
Item B: Add messages to log headset profile connections for HSP and HFP
* Add HeadsetProfileConnectionStats message in bluetooth.proto
* Add HeadsetProfileType enum to represent each headset profile type
* Add num_times_connected item to log how many times each headset
profile is connected
* Add unit tests in metrics_tests
* Remove "clear" flag in various metrics dumping methods to make sure
that we clean up metrics every time we dump
Bug:
77476285
Test: make, net_test_osi, BtFunhausMetricsTest,
adb shell dumpsys bluetooth_manager --proto-bin
Change-Id: Ib18948c50ddb98ab7472f7b51a9bb98d153071c7
Merged-In: Ib18948c50ddb98ab7472f7b51a9bb98d153071c7
(cherry picked from commit
3277682289843134738a51708b5b4928479c36f6)
TreeHugger Robot [Wed, 11 Apr 2018 21:38:19 +0000 (21:38 +0000)]
Merge "DM: Add error logs for failed discovery attempt" into pi-dev
Myles Watson [Wed, 11 Apr 2018 21:28:04 +0000 (14:28 -0700)]
[automerger skipped] Merge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev am:
78c4f6c2c8 -s ours am:
50b37691a7 -s ours
am:
262db7ea43 -s ours
Change-Id: If63fb2626a7b71bc38f4a2c4a4c6a27ea7397822
Myles Watson [Wed, 11 Apr 2018 21:21:38 +0000 (14:21 -0700)]
[automerger skipped] Merge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev am:
78c4f6c2c8 -s ours
am:
50b37691a7 -s ours
Change-Id: Ie6c56bb44aff3fb70cd096dd56700cda4be44a43
Myles Watson [Wed, 11 Apr 2018 21:14:57 +0000 (14:14 -0700)]
[automerger skipped] Merge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev
am:
78c4f6c2c8 -s ours
Change-Id: I2d16866c550715e58e6a5b9db769c2ab3fed939a
TreeHugger Robot [Wed, 11 Apr 2018 21:06:56 +0000 (21:06 +0000)]
Merge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev
Myles Watson [Wed, 11 Apr 2018 20:31:15 +0000 (13:31 -0700)]
[automerger skipped] Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into oc-dev am:
909e70be9e -s ours am:
f566d2d00d -s ours
am:
f441ec4c06 -s ours
Change-Id: I01e5a72fcb8eb780cf2675fa68a8db3154cd1699
Myles Watson [Wed, 11 Apr 2018 20:25:41 +0000 (13:25 -0700)]
[automerger skipped] Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into oc-dev am:
6ff00f1625 am:
1a15b487c3
am:
c262e52807 -s ours
Change-Id: I0fbb6a91505c15feaffcd7426c82cc0447c23123
Myles Watson [Wed, 11 Apr 2018 20:25:40 +0000 (13:25 -0700)]
[automerger skipped] Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into oc-dev am:
909e70be9e -s ours
am:
f566d2d00d -s ours
Change-Id: Ie890bbe7d9a4451182ef8d85580ea943b8319d35
TreeHugger Robot [Wed, 11 Apr 2018 20:25:09 +0000 (20:25 +0000)]
Merge "Call AVRC_close when an AVRCP connection is closed" into pi-dev
Myles Watson [Wed, 11 Apr 2018 20:18:38 +0000 (13:18 -0700)]
[automerger skipped] Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into oc-dev
am:
909e70be9e -s ours
Change-Id: If1bb7b97df8ab79a460fe0b38390cf43b7d6655b
Myles Watson [Wed, 11 Apr 2018 20:18:38 +0000 (13:18 -0700)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into oc-dev am:
6ff00f1625
am:
1a15b487c3
Change-Id: I6231d69cd9da34c8a251cac09c79e9fd0dafd0ba
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e am:
e8017c52aa am:
e68784be2b
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e am:
e8017c52aa
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e am:
e8017c52aa
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into cw-e-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into mnc-dev
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into oc-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e am:
e8017c52aa am:
e68784be2b skipped:
a8ea3b27b4
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e am:
e8017c52aa am:
e68784be2b
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e am:
e8017c52aa
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204 am:
f1d2dd756e
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8 am:
73cc697204
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
Myles Watson [Wed, 11 Apr 2018 20:12:41 +0000 (13:12 -0700)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into oc-dev
am:
6ff00f1625
Change-Id: I62be2f1fa4e2dcd31af5174690d77c8c114f25ff
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f am:
ecb0bd81a9 am:
dfbfd5cb0a
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f am:
ecb0bd81a9
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f am:
ecb0bd81a9
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into nyc-dev
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-
86018ff8-723c-4999-a292-
3b3936b26850" into oc-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f am:
ecb0bd81a9 am:
dfbfd5cb0a skipped:
b5577b5144
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f am:
ecb0bd81a9 am:
dfbfd5cb0a
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f am:
ecb0bd81a9
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d am:
e2a17a082f
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
e04c8be75d
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 19:55:30 +0000 (19:55 +0000)]
Merge "Improve A2DP codec run-time debug-abilitity" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 19:19:10 +0000 (19:19 +0000)]
Merge "Set default AVRCP version to 1.4" into pi-dev
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
PAN: Always allocate in bta_pan_data_buf_ind_cback
Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free. Move the free call to pan_data_buf_ind_cb().
Free the buffer before every return in pan_data_buf_ind_cb.
Bug:
74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
Stanley Tng [Wed, 11 Apr 2018 18:38:25 +0000 (11:38 -0700)]
[automerger skipped] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
0453dc55f3 -s ours am:
e041703d60 -s ours
am:
ea68e71072 -s ours
Change-Id: I8ea97db6054ee6bc7a3c373af4eb54d28a2d5be4
Stanley Tng [Wed, 11 Apr 2018 18:31:59 +0000 (11:31 -0700)]
[automerger skipped] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
0453dc55f3 -s ours
am:
e041703d60 -s ours
Change-Id: I48546d1609fbb606f8f823bc2b594e701d9c7932
Stanley Tng [Wed, 11 Apr 2018 18:25:56 +0000 (11:25 -0700)]
[automerger skipped] DO NOT MERGE Handle bad packet length in gatts_process_read_req
am:
0453dc55f3 -s ours
Change-Id: I3dacf5688e06812c85e34d83826ec1b49a42cf4f
Pavlin Radoslavov [Sat, 7 Apr 2018 00:05:47 +0000 (17:05 -0700)]
Improve A2DP codec run-time debug-abilitity
Rename A2DP_DumpCodecInfo() to A2DP_CodecInfoString() and change
the usage. Previously, A2DP_DumpCodecInfo() would print the
the codec information only if LOG_VERBOSE() was enabled in compile time.
The new A2DP_CodecInfoString() now returns human-readable std::string
with the codec information.
That string can be used in debug log messages that can be enabled
in run-time.
Bug:
77525584
Test: Manual - Examine log messages when A2DP streaming with and
without debug log messages enabled.
Change-Id: Idd440d6c9e908520132feeeb5388d3e6aefa26db
Merged-In: Idd440d6c9e908520132feeeb5388d3e6aefa26db
(cherry picked from commit
25cd05412d18c67b1f0e1f4e07a8178029c0ff0c)
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req
Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.
Bug:
73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit
cc9c7330d1c3507d745170ae7b2e0546197b7acb)
Jack He [Wed, 11 Apr 2018 00:44:35 +0000 (17:44 -0700)]
DM: Add error logs for failed discovery attempt
Bug:
72817086
Test: make, no functional change
Change-Id: I0df4efa62de00956eea1b5b5d244f4821bcaf6fc
(cherry picked from commit
a7ec19cd0e4c90fa33accc03a3ceef037ea38abd)
Ajay Panicker [Wed, 11 Apr 2018 02:24:51 +0000 (19:24 -0700)]
Call AVRC_close when an AVRCP connection is closed
AVRC_Close needs to be called whenever a connection is closed otherwise
the AVCT control block is never cleaned up.
Bug:
77633048
Test: Run host native test net_test_avrcp and connect/disconnect from a
device multiple times.
Change-Id: Ia6a1b2606a87803316aad41ae27db858bf922548
(cherry picked from commit
473b4ca21cde4d28a78b51d9688fd91ca5d814c1)
Stanley Tng [Wed, 11 Apr 2018 15:38:42 +0000 (08:38 -0700)]
[automerger skipped] Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into oc-dev am:
0453868cdc -s ours am:
00a4003806 -s ours
am:
c8fc383c52 -s ours
Change-Id: Ia393fb9e5bbca8b87296db5597e2b54dfaee2c21
Stanley Tng [Wed, 11 Apr 2018 15:37:57 +0000 (08:37 -0700)]
[automerger skipped] Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into oc-dev am:
bbcff76106 am:
3b208999ae -s ours
am:
94dd75425d -s ours
Change-Id: Ib07b9734a235468174d269a48f36adb2e60a6998
Stanley Tng [Wed, 11 Apr 2018 15:32:27 +0000 (08:32 -0700)]
[automerger skipped] Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into oc-dev am:
0453868cdc -s ours
am:
00a4003806 -s ours
Change-Id: I3f6a90234101816bf1bb529501300abcf8111f49
Stanley Tng [Wed, 11 Apr 2018 15:31:54 +0000 (08:31 -0700)]
[automerger skipped] Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into oc-dev am:
bbcff76106
am:
3b208999ae -s ours
Change-Id: I140d8bb85532f52302b1d53b96e722c4e635a412
Stanley Tng [Wed, 11 Apr 2018 15:31:42 +0000 (08:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into oc-mr1-dev
am:
4180fe1c8f -s ours
Change-Id: I46df662ed53e6b025d6c5213e3f73c6be4d812bb
Stanley Tng [Wed, 11 Apr 2018 15:26:23 +0000 (08:26 -0700)]
[automerger skipped] Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into oc-dev
am:
0453868cdc -s ours
Change-Id: If2e1723f3962e0a389132a916986642ae2d396ad
Stanley Tng [Wed, 11 Apr 2018 15:25:58 +0000 (08:25 -0700)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into oc-dev
am:
bbcff76106
Change-Id: Iea878bc39c941987e2905d2c5a970cca9b1950df
TreeHugger Robot [Wed, 11 Apr 2018 15:23:19 +0000 (15:23 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into oc-mr1-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into mnc-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17 am:
39da18a12c am:
20e297a2ba
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17 am:
39da18a12c
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17 am:
39da18a12c
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into oc-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17 am:
39da18a12c am:
20e297a2ba skipped:
45591ce16e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17 am:
39da18a12c am:
20e297a2ba
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17 am:
39da18a12c
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0 am:
4d69ee4e17
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647 am:
2040db3cf0
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into oc-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f am:
775e7073a4 am:
c39fc2ed94 skipped:
40d50bb926
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f am:
775e7073a4 am:
c39fc2ed94
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f am:
775e7073a4
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f am:
775e7073a4 am:
c39fc2ed94
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f am:
775e7073a4
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f am:
775e7073a4
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a am:
d618664a5f
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
810e669d7a
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into nyc-dev
Ajay Panicker [Tue, 10 Apr 2018 23:35:37 +0000 (16:35 -0700)]
Set default AVRCP version to 1.4
Bug:
77874113
Test: Check snoop logs to see that the broadcasted AVRCP version is 1.4
Change-Id: If36bccc58d04dffe46286ee8d18785b680b9de8a
(cherry picked from commit
7d907ab8e66da6e2294fd6b9e042491fc585eebb)
Stanley Tng [Tue, 10 Apr 2018 20:51:46 +0000 (13:51 -0700)]
[automerger skipped] Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into oc-dev am:
0f8ed6f144 -s ours am:
ec8057a6e4 -s ours
am:
d2c8a81a19 -s ours
Change-Id: I6dca799612761563e35d5cbb2f574507c99ab910
Stanley Tng [Tue, 10 Apr 2018 20:46:23 +0000 (13:46 -0700)]
[automerger skipped] Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into oc-dev am:
0f8ed6f144 -s ours
am:
ec8057a6e4 -s ours
Change-Id: I62314f9b9bf7aa4ae711cb08d835b801a8ac709e
Stanley Tng [Tue, 10 Apr 2018 20:42:20 +0000 (13:42 -0700)]
[automerger skipped] Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into oc-dev
am:
0f8ed6f144 -s ours
Change-Id: If9a319232d2befd6cf1a7025ac524e798786d63e
TreeHugger Robot [Tue, 10 Apr 2018 20:37:39 +0000 (20:37 +0000)]
Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into oc-dev
TreeHugger Robot [Tue, 10 Apr 2018 00:55:02 +0000 (00:55 +0000)]
Merge "Allow platforms to override client connection sniff timeout" into pi-dev
Zach Johnson [Fri, 30 Mar 2018 20:33:54 +0000 (13:33 -0700)]
Allow platforms to override client connection sniff timeout
It is already possible to set server connection sniff timeouts.
Bug:
70309445
Test: inspect timeouts via logs
Change-Id: Ibc19dd4f77aa28388169b2ce70d12200020e6a4d
Ajay Panicker [Thu, 5 Apr 2018 16:14:51 +0000 (09:14 -0700)]
Check if socket is closed before getting presentation position
Bug:
76456293
Test: Listen to music on a device that supports delay reporting
Change-Id: I4ca1c31819594750a7beb1d11ca5b8d64a7f836c
(cherry picked from commit
d4f2566ace5acf05d4f19143497c9bdfaf9dce67)
Hansong Zhang [Mon, 9 Apr 2018 22:12:28 +0000 (15:12 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev am:
781315d4af am:
b906b83069 -s ours
am:
3e71e5c2c3 -s ours
Change-Id: I060caa5b714842fd846ca6b9869fbb00cf7faa16
Hansong Zhang [Mon, 9 Apr 2018 22:07:33 +0000 (15:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev am:
781315d4af
am:
b906b83069 -s ours
Change-Id: I19d04178e5de67bacf4e955eaf8c69bf007ebf80
Hansong Zhang [Mon, 9 Apr 2018 22:02:05 +0000 (15:02 -0700)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev
am:
781315d4af
Change-Id: I08035c8474020faf9b8a4d31f0af06adf9be9297
OSDN Git Service
