OSDN Git Service
Andre Eisenbach [Mon, 14 May 2018 20:00:20 +0000 (13:00 -0700)]
Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into pi-dev am:
b13440d973
am:
fbfa52b640
Change-Id: Ie3f6a75fa3c71e28efff40edfa7d181c08e8cb38
Andre Eisenbach [Mon, 14 May 2018 19:51:41 +0000 (12:51 -0700)]
Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into pi-dev
am:
b13440d973
Change-Id: I31f60ef428b01feec0416fb36bd5ce947511df6e
Andre Eisenbach [Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)]
Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into pi-dev
Ajay Panicker [Mon, 14 May 2018 18:55:43 +0000 (11:55 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7 am:
7860023df0 am:
1817ac9854 am:
e596981c73
am:
b3fbac073a
Change-Id: I717ef8d146ce2eeb8a5fa378aeaddc12f9ddf33a
Ajay Panicker [Mon, 14 May 2018 18:49:26 +0000 (11:49 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7 am:
7860023df0 am:
1817ac9854
am:
e596981c73
Change-Id: I449f152f3cdac1abe0e7bf7eb8bc98b336562142
Ajay Panicker [Mon, 14 May 2018 18:49:04 +0000 (11:49 -0700)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete" am:
1819a3f240 am:
4e35a128e1
am:
a4bbf2210d
Change-Id: I515cf95c2c6c2be6f9a5dbe00028a609926b88cf
Ajay Panicker [Mon, 14 May 2018 18:47:49 +0000 (11:47 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32 am:
992d901683 am:
3c6d9aef37 am:
0b97de9ce3
am:
c6eea86c84
Change-Id: I3e2be2db574f5e4d428883b9c5776844a49f57ce
Ajay Panicker [Mon, 14 May 2018 18:45:23 +0000 (11:45 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7 am:
7860023df0
am:
1817ac9854
Change-Id: I6b715a091134e48bc2c96d22134c66fc67b155c5
Ajay Panicker [Mon, 14 May 2018 18:41:20 +0000 (11:41 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev am:
28af3285c7
am:
7860023df0
Change-Id: Id8004ef8b208731ba321e3abd1bb562a29f03548
Ajay Panicker [Mon, 14 May 2018 18:41:17 +0000 (11:41 -0700)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete" am:
1819a3f240
am:
4e35a128e1
Change-Id: I748d0129edbf3ca133f871509cd46a08ba5e302b
Ajay Panicker [Mon, 14 May 2018 18:37:26 +0000 (11:37 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev
am:
28af3285c7
Change-Id: I9bb0aa68376166994103a659d181e3f7f071c3b5
Ajay Panicker [Mon, 14 May 2018 18:37:17 +0000 (11:37 -0700)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete"
am:
1819a3f240
Change-Id: I0115c55090ab3a725a6c99cc9c9b0e235cc14ca2
Ajay Panicker [Mon, 14 May 2018 18:27:46 +0000 (11:27 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32 am:
992d901683 am:
3c6d9aef37
am:
0b97de9ce3
Change-Id: If3524205f1dd794ff3856c694b4c23bcc1db2ecc
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3 skipped:
ec6632f93a
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:26:16 +0000 (18:26 +0000)]
Merge "Use weak pointers for device.cc callbacks to prevent use after delete"
Ajay Panicker [Mon, 14 May 2018 18:19:40 +0000 (11:19 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32 am:
992d901683
am:
3c6d9aef37
Change-Id: I83ccedc2c4a6e36e66c0b398db8e2578e3c379a6
Ajay Panicker [Mon, 14 May 2018 18:15:08 +0000 (11:15 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev am:
89c77dff32
am:
992d901683
Change-Id: I4822314170228bc6df8d3b60f7ee04ea4fa7c5c2
Ajay Panicker [Mon, 14 May 2018 18:11:06 +0000 (11:11 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
am:
89c77dff32
Change-Id: I50263727a1020e77133f92938f6ecf0770eef14f
Ajay Panicker [Mon, 14 May 2018 18:01:38 +0000 (18:01 +0000)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
Hansong Zhang [Sat, 12 May 2018 00:22:48 +0000 (17:22 -0700)]
Merge "Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into pi-dev am:
0519b056fa
am:
4300c41b4a
Change-Id: I5d568e73cd28e7feba50f4dae2569ccf218fcaef
Pavlin Radoslavov [Sat, 12 May 2018 00:22:28 +0000 (17:22 -0700)]
[automerger skipped] Merge "Explicitly restart audio processing when switching active device" into pi-dev am:
2a8c2b2cd9 -s ours
am:
dfa37782ae -s ours
Change-Id: I4a399100e8235fabd1346a3796de90e966b8779d
Ajay Panicker [Sat, 12 May 2018 00:22:03 +0000 (17:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am:
2f9f6adfed am:
aded757078 am:
4a6c4b0c64 -s ours am:
bb23eb3daf
am:
a4f69c41f7 -s ours
Change-Id: Ia2fe73e29cf9255a372dc1bcde32e37ddd85919a
Hansong Zhang [Sat, 12 May 2018 00:21:18 +0000 (17:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev am:
cf48e73715 am:
1fc8fe3b9f am:
3e207131ab -s ours am:
b95cde5279
am:
c74ca0a3e8 -s ours
Change-Id: Ia4c236065e31a142a133fb7c9527eaa7d063c2f5
Hansong Zhang [Sat, 12 May 2018 00:20:57 +0000 (17:20 -0700)]
[automerger skipped] [automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00 am:
e719eb2c4f am:
f7ecdd2915 am:
9b5b26bc63 -s ours am:
8f9b688f61
am:
38620d4dbf -s ours
Change-Id: Iebf9b2ecddcbab725d73c043a5e65c559beb919a
Jack He [Sat, 12 May 2018 00:18:16 +0000 (17:18 -0700)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command" am:
7b958f6ea7 am:
191a9f5e42
am:
96beb134a0
Change-Id: Ibecb1aaa409325b3278665a261d1cdadfd071172
Jack He [Sat, 12 May 2018 00:00:56 +0000 (17:00 -0700)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command" into pi-dev am:
1cce9baf77
am:
825fe85c12
Change-Id: I563d70caee0599efda1b49e65ecc7a9266637749
Hansong Zhang [Fri, 11 May 2018 23:50:39 +0000 (16:50 -0700)]
Merge "Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into pi-dev
am:
0519b056fa
Change-Id: Ief02232be4c8c8992395a21a931284ebdc30fd07
Hansong Zhang [Fri, 11 May 2018 23:50:01 +0000 (16:50 -0700)]
Merge "Hearing Aid: Add dumpsys log for audio packet" into pi-dev am:
be96a9ed5d
am:
22cc6d59ab
Change-Id: Ibff83c23862265da695be0d320d19bfa3e6c59ba
Myles Watson [Fri, 11 May 2018 23:33:25 +0000 (16:33 -0700)]
Merge "bta: Only call get_acl_data_size_ble for LE" into pi-dev am:
efb1f12e8d
am:
7d51934cce
Change-Id: I36d6e30196b9257dec8c42f4b040c4c1056b0c7f
TreeHugger Robot [Fri, 11 May 2018 23:30:55 +0000 (23:30 +0000)]
Merge "Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into pi-dev
Pavlin Radoslavov [Fri, 11 May 2018 23:28:38 +0000 (16:28 -0700)]
[automerger skipped] Merge "Explicitly restart audio processing when switching active device" into pi-dev
am:
2a8c2b2cd9 -s ours
Change-Id: If2c8879b3e41abcba0e9a0619ef24ba73b106658
Myles Watson [Fri, 11 May 2018 23:26:55 +0000 (16:26 -0700)]
Merge "BTM_BleClearBgConnDev: Return if there is no BLE" into pi-dev am:
0cf31d8e1c
am:
d34d356672
Change-Id: I24a1f6e00294aa9af8f563ae367f3dfb74be5bb0
Myles Watson [Fri, 11 May 2018 23:20:48 +0000 (16:20 -0700)]
Merge "Return early if vendor-specific command fails" into pi-dev am:
377a95993b
am:
904b2a2b9e
Change-Id: I44b160a2f2aa795ae96522b5c279c75f821e8376
TreeHugger Robot [Fri, 11 May 2018 23:16:03 +0000 (23:16 +0000)]
Merge "Explicitly restart audio processing when switching active device" into pi-dev
Ajay Panicker [Fri, 11 May 2018 23:15:42 +0000 (16:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am:
2f9f6adfed am:
aded757078 am:
4a6c4b0c64 -s ours
am:
bb23eb3daf
Change-Id: I1d3a9f2c40c9df267b7adf2f47e8fb5ddc4ce3c7
Hansong Zhang [Fri, 11 May 2018 23:13:58 +0000 (16:13 -0700)]
[automerger skipped] Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev am:
cf48e73715 am:
1fc8fe3b9f am:
3e207131ab -s ours
am:
b95cde5279
Change-Id: I35f1a284e7634d67fc974baf810972bf37f7a78d
Hansong Zhang [Fri, 11 May 2018 23:11:56 +0000 (16:11 -0700)]
[automerger skipped] [automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00 am:
e719eb2c4f am:
f7ecdd2915 am:
9b5b26bc63 -s ours
am:
8f9b688f61
Change-Id: I11af46cc0496ea6bf8342d7e93e1f29cca219806
Pavlin Radoslavov [Fri, 11 May 2018 23:04:44 +0000 (16:04 -0700)]
Merge "Explicitly restart audio processing when switching active device" am:
2ffc9901cb am:
acbde8a6a2
am:
3c6e4808c1
Change-Id: I2983472d4cae9e59848cd8f4ba7be5efa0f285a0
Ajay Panicker [Fri, 11 May 2018 22:45:35 +0000 (15:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am:
2f9f6adfed am:
aded757078
am:
4a6c4b0c64 -s ours
Change-Id: I979219abffdf2fa7e851dcc326931c1c25d219fa
Hansong Zhang [Fri, 11 May 2018 22:45:23 +0000 (15:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev am:
cf48e73715 am:
1fc8fe3b9f
am:
3e207131ab -s ours
Change-Id: Iea5616f8aa43080304bdc30dd1543f2c2930401b
Hansong Zhang [Fri, 11 May 2018 22:45:05 +0000 (15:45 -0700)]
[automerger skipped] [automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00 am:
e719eb2c4f am:
f7ecdd2915
am:
9b5b26bc63 -s ours
Change-Id: Ie3d309838be405e0c800a235861a7862d99cf230
Ajay Panicker [Fri, 11 May 2018 22:41:24 +0000 (15:41 -0700)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am:
2f9f6adfed
am:
aded757078
Change-Id: I4ec111d45f8e76aef0095dbf2051b4c3e1f43c5a
Hansong Zhang [Fri, 11 May 2018 22:41:03 +0000 (15:41 -0700)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev am:
cf48e73715
am:
1fc8fe3b9f
Change-Id: I4ed11e20c3815108510e9d84a6afeda583254613
Hansong Zhang [Fri, 11 May 2018 22:40:42 +0000 (15:40 -0700)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00 am:
e719eb2c4f
am:
f7ecdd2915
Change-Id: Iaf1eada64bbf87ce545d4d0a975041b51bfb911e
Ajay Panicker [Fri, 11 May 2018 22:37:23 +0000 (15:37 -0700)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev
am:
2f9f6adfed
Change-Id: Ic6cfdf0368ff5b55a0cc0a4a41b006947d520cd4
Hansong Zhang [Fri, 11 May 2018 22:37:00 +0000 (15:37 -0700)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev
am:
cf48e73715
Change-Id: Ie3b83f993975a6ac532072c774a3ca6c0d0b5272
Hansong Zhang [Fri, 11 May 2018 22:36:38 +0000 (15:36 -0700)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00
am:
e719eb2c4f
Change-Id: I4626e6077542b983e7b6c8ba40d58f462fc215bb
TreeHugger Robot [Fri, 11 May 2018 22:26:01 +0000 (22:26 +0000)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev
TreeHugger Robot [Fri, 11 May 2018 22:24:23 +0000 (22:24 +0000)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev
Jack He [Fri, 11 May 2018 22:10:35 +0000 (15:10 -0700)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command" am:
7b958f6ea7
am:
191a9f5e42
Change-Id: I855dcc28472cc7922340c8f9a084c85ab1687e03
Jack He [Fri, 11 May 2018 22:07:00 +0000 (15:07 -0700)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command"
am:
7b958f6ea7
Change-Id: Ibb8634a3c9b01911825bb7a07a29fb02e95bf5ed
Jack He [Fri, 11 May 2018 21:57:07 +0000 (14:57 -0700)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command" into pi-dev
am:
1cce9baf77
Change-Id: I11baf8fdb6ad2e35e178e0f22488d4d44875cd98
Hansong Zhang [Fri, 11 May 2018 21:56:45 +0000 (14:56 -0700)]
Merge "Hearing Aid: Add dumpsys log for audio packet" into pi-dev
am:
be96a9ed5d
Change-Id: I1dfdd4c70959056e41126bdad24aa4bfe06892d8
Myles Watson [Fri, 11 May 2018 21:56:19 +0000 (14:56 -0700)]
Merge "bta: Only call get_acl_data_size_ble for LE" into pi-dev
am:
efb1f12e8d
Change-Id: Ieec5d20bc3b86e8a02e6e1f558970cbb8e31f617
Myles Watson [Fri, 11 May 2018 21:55:43 +0000 (14:55 -0700)]
Merge "BTM_BleClearBgConnDev: Return if there is no BLE" into pi-dev
am:
0cf31d8e1c
Change-Id: Iccc74f66822cc4778c225b8cb0c6ea993deb2610
Myles Watson [Fri, 11 May 2018 21:54:41 +0000 (14:54 -0700)]
Merge "Return early if vendor-specific command fails" into pi-dev
am:
377a95993b
Change-Id: I53e95f39f6021048a383b286785f00edc9d9b40b
Treehugger Robot [Fri, 11 May 2018 21:53:02 +0000 (21:53 +0000)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command"
TreeHugger Robot [Fri, 11 May 2018 21:52:53 +0000 (21:52 +0000)]
Merge "HFP: Workaround for car kits that do not send AT+BAC command" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 21:47:23 +0000 (21:47 +0000)]
Merge "Hearing Aid: Add dumpsys log for audio packet" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 21:46:26 +0000 (21:46 +0000)]
Merge "bta: Only call get_acl_data_size_ble for LE" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 21:46:23 +0000 (21:46 +0000)]
Merge "BTM_BleClearBgConnDev: Return if there is no BLE" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 21:46:20 +0000 (21:46 +0000)]
Merge "Return early if vendor-specific command fails" into pi-dev
Pavlin Radoslavov [Thu, 10 May 2018 16:52:58 +0000 (09:52 -0700)]
Explicitly restart audio processing when switching active device
* Add internal APIs to restart A2DP session and use them
when switching the A2DP active device:
btif_a2dp_source_restart_session() and btif_a2dp_sink_restart_session() .
* Removed internal A2DP Source APIs that shouldn't be APIs
* Call immediately btif_a2dp_on_stopped() when processing
BTIF_AV_STOP_STREAM_REQ_EVT event to stop sooner the audio
datapath processing and report back to the Audio HAL call.
This eliminates the need for waiting for the BTA_AV_STOP_EVT
upcall event from the remote device.
* Added extra log information when processing events in the BtifAv
state machine.
Bug:
78360113
Test: Manual: streaming A2DP, change active device, change codec setup.
Change-Id: Icb356587af9cfaee7aea9f3f9bc95a0fe000fc52
Merged-In: Icb356587af9cfaee7aea9f3f9bc95a0fe000fc52
(cherry picked from commit
c7a5e6038a1c01de1a2219659f999e91003af598)
Pavlin Radoslavov [Fri, 11 May 2018 21:18:17 +0000 (14:18 -0700)]
Merge "Explicitly restart audio processing when switching active device" am:
2ffc9901cb
am:
acbde8a6a2
Change-Id: I32b7d91a2f7c65895d4823e95ae91e93c24fc1e5
Pavlin Radoslavov [Fri, 11 May 2018 21:14:42 +0000 (14:14 -0700)]
Merge "Explicitly restart audio processing when switching active device"
am:
2ffc9901cb
Change-Id: I41623252ea3f20c8afae1cf34612a3fb0ac32e2b
Treehugger Robot [Fri, 11 May 2018 21:06:43 +0000 (21:06 +0000)]
Merge "Explicitly restart audio processing when switching active device"
Hansong Zhang [Fri, 11 May 2018 18:36:29 +0000 (11:36 -0700)]
Add bound check for AVRC_EVT_APP_SETTING_CHANGE
Test: manual
Bug:
73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86
Pavlin Radoslavov [Thu, 10 May 2018 16:52:58 +0000 (09:52 -0700)]
Explicitly restart audio processing when switching active device
* Add internal APIs to restart A2DP session and use them
when switching the A2DP active device:
btif_a2dp_source_restart_session() and btif_a2dp_sink_restart_session() .
* Removed internal A2DP Source APIs that shouldn't be APIs
* Call immediately btif_a2dp_on_stopped() when processing
BTIF_AV_STOP_STREAM_REQ_EVT event to stop sooner the audio
datapath processing and report back to the Audio HAL call.
This eliminates the need for waiting for the BTA_AV_STOP_EVT
upcall event from the remote device.
* Added extra log information when processing events in the BtifAv
state machine.
Bug:
78360113
Test: Manual: streaming A2DP, change active device, change codec setup.
Change-Id: Icb356587af9cfaee7aea9f3f9bc95a0fe000fc52
Ajay Panicker [Fri, 11 May 2018 19:03:07 +0000 (12:03 -0700)]
DO NOT MERGE: Check number of attributes before writing to a buffer
Bug:
73824150
Test: Compile
Change-Id: I2a28a503cd74758e707d1e591b55c278d2299f45
Android Build Merger (Role) [Fri, 11 May 2018 18:58:10 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3 skipped:
ec6632f93a
Change-Id: Id43b919238d9f5bf7b9621e1a492fcab41e77282
Android Build Merger (Role) [Fri, 11 May 2018 18:58:09 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3
Change-Id: Ice70ef13544a1f93a9dafb71241141274b81a7f1
Android Build Merger (Role) [Fri, 11 May 2018 18:58:08 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb
Change-Id: Id36e3e2c089f6302db698b844a7ed0042e5b8658
Android Build Merger (Role) [Fri, 11 May 2018 18:58:06 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
Change-Id: I8df01c872458bbc8b4ab435855b6c76353c8dab7
Android Build Merger (Role) [Fri, 11 May 2018 18:58:05 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
Change-Id: Ic7688754333ee91513ef0fcd47594eb9e561b3dd
Ajay Panicker [Fri, 11 May 2018 18:47:31 +0000 (11:47 -0700)]
DO NOT MERGE: Check number of attributes before writing to a buffer
Bug:
73824150
Test: Compile
Change-Id: Ie38ba177d6599afe28b5c6684bd951a75fa8a805
Hansong Zhang [Fri, 11 May 2018 18:36:29 +0000 (11:36 -0700)]
DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE
Test: manual
Bug:
73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86
Android Build Merger (Role) [Fri, 11 May 2018 18:41:13 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00
Change-Id: Ibcd75cd9298d3b3d03da14813514f662a141c66e
Android Build Merger (Role) [Fri, 11 May 2018 18:41:11 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087
Change-Id: I45890811e5ea93ef7b2e42380b68064831a58097
Android Build Merger (Role) [Fri, 11 May 2018 18:41:10 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81
Change-Id: I3b58713fffba346fb96b93632755a41cf9f5a88e
Android Build Merger (Role) [Fri, 11 May 2018 18:41:08 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539
Change-Id: I0f8c4399029939d01cdf9be1827e0957df8fcde6
Android Build Merger (Role) [Fri, 11 May 2018 18:41:06 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100
Change-Id: Ic53f90a5ce4767355afaeb0852053120f28df135
Hansong Zhang [Fri, 11 May 2018 18:40:44 +0000 (11:40 -0700)]
DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE
Test: manual
Bug:
73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86
Jack He [Tue, 1 May 2018 06:59:40 +0000 (23:59 -0700)]
HFP: Workaround for car kits that do not send AT+BAC command
* Some misbehaving HF devices (e.g. some Hyundai car kits) indicate
their support on Wide Band Speech and Codec Negotiation, but do not
send the required AT+BAC command during Service Level Connection
setup. However, such car kits still expect Fluoride to do codec
negotiation during SCO setup.
* This CL adds a workaround so that when HF indicates support for WBS
and codec negotiation, Fluoride will attempt codec negotiation even
though AT+BAC is never received.
* Store the SDP feature locally. If WBS is supported and no AT+BAC is
received, use the SDP features to set the suported codec.
Bug:
77883405
Test: make, connect SCO to and from Hyundai car kits
Change-Id: I2be6007022183cac5b9006f37089a587b4a67372
(cherry picked from commit
e42cf153f8cc9f2b80153aa3eb7c0be04f3c326f)
Jack He [Tue, 1 May 2018 06:59:40 +0000 (23:59 -0700)]
HFP: Workaround for car kits that do not send AT+BAC command
* Some misbehaving HF devices (e.g. some Hyundai car kits) indicate
their support on Wide Band Speech and Codec Negotiation, but do not
send the required AT+BAC command during Service Level Connection
setup. However, such car kits still expect Fluoride to do codec
negotiation during SCO setup.
* This CL adds a workaround so that when HF indicates support for WBS
and codec negotiation, Fluoride will attempt codec negotiation even
though AT+BAC is never received.
* Store the SDP feature locally. If WBS is supported and no AT+BAC is
received, use the SDP features to set the suported codec.
Bug:
77883405
Test: make, connect SCO to and from Hyundai car kits
Change-Id: I2be6007022183cac5b9006f37089a587b4a67372
tedwang [Wed, 9 May 2018 06:28:04 +0000 (14:28 +0800)]
Add respond Reject with Invalid parameter for Unknown Capability ID
Add handle Get Capabilities with Unknown Capability ID and unit test
for this.
Bug:
79269978
Test: Run host native test net_test_avrcp
Change-Id: I2cb606bcb6462190354bb471577d9383e43649c1
Ajay Panicker [Fri, 11 May 2018 01:25:07 +0000 (18:25 -0700)]
Merge "Add helper classes to auto indent newlines for ostreams" am:
e3c041c4a4 am:
a0376df4af
am:
0ec7e8476a
Change-Id: I4bd3aef6e4964e723e68c3d74ecda4333d0c48d9
Jack He [Fri, 11 May 2018 01:16:58 +0000 (18:16 -0700)]
Merge "A2DP: Add logging when A2DP fails to open" into pi-dev am:
547b1b0a21
am:
7f4892d68b
Change-Id: Ie25a95456499b36b557413098d1cc41a4e2da418
Jakub Pawlowski [Fri, 11 May 2018 01:03:00 +0000 (18:03 -0700)]
Merge "HearingAid RemoveDevice - don't crash when profile not enabled" into pi-dev am:
217f0ee249
am:
d782aa8247
Change-Id: I57e5fd07e6ef9c0b4d8b2f5ccb82e6fa9e33e8fc
Hansong Zhang [Fri, 11 May 2018 00:26:58 +0000 (17:26 -0700)]
Merge "Hearing Aid: Add dumpsys log for audio packet" am:
5ac698c04e am:
1fcee73890
am:
a1d810024b
Change-Id: Icca9ad7e524a82eae8f0af053d4947103f0a6d4e
Ajay Panicker [Thu, 10 May 2018 23:54:42 +0000 (16:54 -0700)]
Use weak pointers for device.cc callbacks to prevent use after delete am:
497e2833c9
am:
450d4b5bae
Change-Id: I91e5f576960cf9e785be183acf8e542466412c5f
Myles Watson [Thu, 3 May 2018 18:13:55 +0000 (11:13 -0700)]
bta: Only call get_acl_data_size_ble for LE
Pass 0xFFFF (max uint16_t) to GAP_ConnOpen, which will call
get_acl_data_size_ble() to correct the value, but only when the
connection type is LE.
Bug:
77495521
Bug:
76192234
Test: Start Bluetooth with a BT 3.0 chip (or a simulated one)
Change-Id: If46ea249081fc058faf09bcb5149f21d8baf7aa7
(cherry picked from commit
a11bb2dcc23304a2d211f8b5237a5f5bff325880)
Myles Watson [Fri, 4 May 2018 17:15:46 +0000 (10:15 -0700)]
BTM_BleClearBgConnDev: Return if there is no BLE
Bug:
77495521
Bug:
76192234
Test: Start Bluetooth with a BT 3.0 chip (or a simulated one)
Change-Id: I718b7532bbba6100dd51c0677a44d41a2db0ce26
(cherry picked from commit
17fe6e4e06f38e5d997d81f8dfccfa744fe384a6)
Myles Watson [Thu, 3 May 2018 18:15:50 +0000 (11:15 -0700)]
Return early if vendor-specific command fails
Add CHECK() statements to crash if the callback is passed the incorrect
opcode or if there are no parameters.
Bug:
76192234
Bug:
77495521
Test: Start Bluetooth with a BT 3.0 chip (or a simulated one)
Change-Id: Iddd9a8503b2cfd52b16fb1c59f40e108b478e7b6
(cherry picked from commit
aa10181425bc2fa3141d98f954abdb2b5aa641c9)
Ajay Panicker [Thu, 10 May 2018 22:54:54 +0000 (15:54 -0700)]
Merge "Add helper classes to auto indent newlines for ostreams" am:
e3c041c4a4
am:
a0376df4af
Change-Id: Ie5591642f7266881961463f3db957e0749698be6
Ajay Panicker [Thu, 10 May 2018 22:51:31 +0000 (15:51 -0700)]
Merge "Add helper classes to auto indent newlines for ostreams"
am:
e3c041c4a4
Change-Id: Ifbcafaa32c70a3400b609772e0ec55bf1136abef
Ajay Panicker [Thu, 10 May 2018 19:39:32 +0000 (12:39 -0700)]
Use weak pointers for device.cc callbacks to prevent use after delete
Bug:
79400706
Test: Turn bluetooth off then on while connected to a device and playing
music
Change-Id: I2132bb01796a724fba6a36f4eca4f4795b919864
(cherry picked from commit
497e2833c983377ae501c15d5c66327c9c5dbafa)
Jack He [Thu, 10 May 2018 22:47:13 +0000 (15:47 -0700)]
Merge "A2DP: Add logging when A2DP fails to open" into pi-dev
am:
547b1b0a21
Change-Id: Ifaa334e3e445fbf38238a4823c56640f5aa41ac1
TreeHugger Robot [Thu, 10 May 2018 22:38:39 +0000 (22:38 +0000)]
Merge "A2DP: Add logging when A2DP fails to open" into pi-dev
Treehugger Robot [Thu, 10 May 2018 22:35:02 +0000 (22:35 +0000)]
Merge "Add helper classes to auto indent newlines for ostreams"
Jakub Pawlowski [Thu, 10 May 2018 22:20:38 +0000 (15:20 -0700)]
Merge "HearingAid RemoveDevice - don't crash when profile not enabled" into pi-dev
am:
217f0ee249
Change-Id: I4b78406a2ef6d91d5826d71fc5910bc87b83e077
OSDN Git Service
