OSDN Git Service

android-x86/system-bt.git
7 years agoFix NPE in l2cble_notify_le_connection am: b4458c93d5 am: 2049c27daf
Jakub Pawlowski [Thu, 15 Sep 2016 22:00:18 +0000 (22:00 +0000)]
Fix NPE in l2cble_notify_le_connection am: b4458c93d5 am: 2049c27daf
am: 59b67c9d1e

Change-Id: I99280ae406d22116c5238b635ec3999b2d70ebc6

7 years agoMerge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" am: 2d8048d72f am: 84459...
Jakub Pawlowski [Thu, 15 Sep 2016 22:00:17 +0000 (22:00 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" am: 2d8048d72f am: 8445951ea7
am: 4c25ffc226

Change-Id: I7474bc3b19514d1a3f684dbf6961422948a108e0

7 years agoFix NPE in l2cble_notify_le_connection am: b4458c93d5
Jakub Pawlowski [Thu, 15 Sep 2016 21:55:52 +0000 (21:55 +0000)]
Fix NPE in l2cble_notify_le_connection am: b4458c93d5
am: 2049c27daf

Change-Id: I9c25ed898755346d67592e6fb6ec11e7fcf4b19f

7 years agoMerge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" am: 2d8048d72f
Jakub Pawlowski [Thu, 15 Sep 2016 21:55:51 +0000 (21:55 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT" am: 2d8048d72f
am: 8445951ea7

Change-Id: Id88abcd5a6ded1fccb58dafec19d694e7bab9b05

7 years agoFix NPE in l2cble_notify_le_connection
Jakub Pawlowski [Thu, 15 Sep 2016 21:53:07 +0000 (21:53 +0000)]
Fix NPE in l2cble_notify_le_connection
am: b4458c93d5

Change-Id: I4d4e647734515a2364b69afb31ca838725d014b8

7 years agoMerge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT"
Jakub Pawlowski [Thu, 15 Sep 2016 21:53:07 +0000 (21:53 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT"
am: 2d8048d72f

Change-Id: Ie0e87e60834c9223b4a5ee338f7aa157f8b37095

7 years agoFix NPE in l2cble_notify_le_connection
Jakub Pawlowski [Thu, 15 Sep 2016 15:04:04 +0000 (08:04 -0700)]
Fix NPE in l2cble_notify_le_connection

Accessing p_lcb must be guarded with NULL check.

Bug: 31442085
Change-Id: I0f6e3f8e0247c5e8946c4d098f8a3ba442f5fb28

7 years agoMerge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT"
Treehugger Robot [Thu, 15 Sep 2016 21:41:57 +0000 (21:41 +0000)]
Merge "Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT"

7 years agoMerge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event" am: c94437561f am: 65677c9331
Pavlin Radoslavov [Thu, 15 Sep 2016 21:00:43 +0000 (21:00 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event" am: c94437561f am: 65677c9331
am: 2ae0370526

Change-Id: I5a2bd8ca09cb78f3e419fc8a30bf28a53e6c707d

7 years agoMerge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event" am: c94437561f
Pavlin Radoslavov [Thu, 15 Sep 2016 20:58:01 +0000 (20:58 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event" am: c94437561f
am: 65677c9331

Change-Id: I3efa81485765b7dec9a5f4482be802ae75efdbd2

7 years agoMerge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event"
Pavlin Radoslavov [Thu, 15 Sep 2016 20:55:31 +0000 (20:55 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event"
am: c94437561f

Change-Id: Id78a7d380b1a1cbedecec73d26b9d41067211d74

7 years agoMerge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event"
Treehugger Robot [Thu, 15 Sep 2016 20:35:41 +0000 (20:35 +0000)]
Merge "Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event"

7 years agoAdd a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT
Jakub Pawlowski [Thu, 15 Sep 2016 15:02:05 +0000 (08:02 -0700)]
Add a missing case for BTA_DM_SEARCH_CANCEL_CMPL_EVT

Cancelling discovery was not handled properly in
btif_dm_search_services_evt and was causing crashes due to assert in
default case.

Bug: 31442085
Change-Id: If9a2c203730c9b06df5ff8d8e251f0c35addcb82

7 years agoDon't use move in FOR_EACH_* macro am: 10c37e63c1 am: f004056a16
Jakub Pawlowski [Thu, 15 Sep 2016 13:44:01 +0000 (13:44 +0000)]
Don't use move in FOR_EACH_* macro am: 10c37e63c1 am: f004056a16
am: 98baa0c9c3

Change-Id: Icdbbe9d1205924b56a8143cb7546a50e1ceb2254

7 years agoDon't use move in FOR_EACH_* macro am: 10c37e63c1
Jakub Pawlowski [Thu, 15 Sep 2016 13:41:30 +0000 (13:41 +0000)]
Don't use move in FOR_EACH_* macro am: 10c37e63c1
am: f004056a16

Change-Id: I432ada61603549998900fac1a27713ebab2a50dc

7 years agoDon't use move in FOR_EACH_* macro
Jakub Pawlowski [Thu, 15 Sep 2016 13:38:30 +0000 (13:38 +0000)]
Don't use move in FOR_EACH_* macro
am: 10c37e63c1

Change-Id: Ieb71b05695a6e362aab1f79aa8d83e520bd70321

7 years agoDon't use move in FOR_EACH_* macro
Jakub Pawlowski [Thu, 15 Sep 2016 11:04:37 +0000 (04:04 -0700)]
Don't use move in FOR_EACH_* macro

FOR_EACH_* macros are resolved to for loop. Using std::move inside it
will cause already moved object to be used when more than one observer
is registered. This patch fixes that.

This issue was already fixed in commit e84c4bd, but was reintroduced in
a641b6fa.

Change-Id: I14b72371d369e4bdcaf3a6e30045bf8a1e8c3e1b

7 years agoAdd BT_HCI_UNKNOWN_MESSAGE_TYPE log event
Pavlin Radoslavov [Wed, 14 Sep 2016 23:39:02 +0000 (16:39 -0700)]
Add BT_HCI_UNKNOWN_MESSAGE_TYPE log event

If the received HCI type is unknown, then log an event and abort.
The most likely reason for that to happen is if the UART stream
is corrupted. We cannot recover from that, and there is not much
else we can do.

Also, fixed a bug in an HCI-related unit test that was exposed
by the above change.

Bug: 31432127
Change-Id: Ia888c485f177af4962268bf8f593b27fd7a4b080

7 years agoMerge "Add security record for devices found through LE batch scan" am: c8bd6de515...
Andre Eisenbach [Wed, 14 Sep 2016 23:05:02 +0000 (23:05 +0000)]
Merge "Add security record for devices found through LE batch scan" am: c8bd6de515 am: 11f412019a
am: 6f27f44943

Change-Id: I6931a53171e65d06232c6bf959a21a73837774eb

7 years agoMerge "Add security record for devices found through LE batch scan" am: c8bd6de515
Andre Eisenbach [Wed, 14 Sep 2016 22:09:07 +0000 (22:09 +0000)]
Merge "Add security record for devices found through LE batch scan" am: c8bd6de515
am: 11f412019a

Change-Id: I3b5a3b051f9a312ee8b573d7b79c97492cf1e8f6

7 years agoMerge "Add security record for devices found through LE batch scan"
Andre Eisenbach [Wed, 14 Sep 2016 22:06:06 +0000 (22:06 +0000)]
Merge "Add security record for devices found through LE batch scan"
am: c8bd6de515

Change-Id: If593628632df3b60b2906de10f830fed464661be

7 years agoMerge "Add security record for devices found through LE batch scan"
Treehugger Robot [Wed, 14 Sep 2016 22:02:25 +0000 (22:02 +0000)]
Merge "Add security record for devices found through LE batch scan"

7 years agotest_vendor: Remove unnecessary const from params am: 354a9bf886 am: 4a0b6e0ede
Myles Watson [Wed, 14 Sep 2016 21:11:02 +0000 (21:11 +0000)]
test_vendor: Remove unnecessary const from params am: 354a9bf886 am: 4a0b6e0ede
am: fdc7f4722d

Change-Id: I93a831017114937102de7ecdeaa8d9dd7ed2b875

7 years agotest_vendor: Remove unnecessary const from params am: 354a9bf886
Myles Watson [Wed, 14 Sep 2016 21:08:08 +0000 (21:08 +0000)]
test_vendor: Remove unnecessary const from params am: 354a9bf886
am: 4a0b6e0ede

Change-Id: I442db44dd7d8355bcd009783d55848cf9153d681

7 years agotest_vendor: Remove unnecessary const from params
Myles Watson [Wed, 14 Sep 2016 21:04:32 +0000 (21:04 +0000)]
test_vendor: Remove unnecessary const from params
am: 354a9bf886

Change-Id: Idd092ebf7c1a97ffa816bd60bf3ee451252b3a75

7 years agoAdd security record for devices found through LE batch scan
Andre Eisenbach [Wed, 14 Sep 2016 19:41:37 +0000 (12:41 -0700)]
Add security record for devices found through LE batch scan

Currently, starting an LE batch scan are not added to the stack internal
device database, which means that the address type and device type
needed for a connection are not available.

This patch ensures that devices found during an LE scan are added to the
device database to ensure connection attempts will succeed.

Bug: 31309376
Change-Id: Ic52d7eaa03d17dcbbd848af9140038bc84ea3bd0

7 years agotest_vendor: Remove unnecessary const from params
Myles Watson [Wed, 14 Sep 2016 18:39:33 +0000 (11:39 -0700)]
test_vendor: Remove unnecessary const from params

Change-Id: I6502e3e78f139722bb887640dcc00ee79f1b0044

7 years agoRemoved unused local variable am: ac59fa20a7 am: b77127c06c
Pavlin Radoslavov [Wed, 14 Sep 2016 05:22:01 +0000 (05:22 +0000)]
Removed unused local variable am: ac59fa20a7 am: b77127c06c
am: c312916c5e

Change-Id: If1be5e2bb12d952b2e74423d4273d08c230d37ea

7 years agoRemoved unused local variable am: ac59fa20a7
Pavlin Radoslavov [Wed, 14 Sep 2016 05:19:01 +0000 (05:19 +0000)]
Removed unused local variable am: ac59fa20a7
am: b77127c06c

Change-Id: Ie7d8f0dac5b69f7042531493a502b8f5549adf67

7 years agoRemoved unused local variable
Pavlin Radoslavov [Wed, 14 Sep 2016 05:16:30 +0000 (05:16 +0000)]
Removed unused local variable
am: ac59fa20a7

Change-Id: I365c7c4c9575120c9363e971f8cd85b3235cbc3d

7 years agoRemoved unused local variable
Pavlin Radoslavov [Wed, 14 Sep 2016 05:00:53 +0000 (22:00 -0700)]
Removed unused local variable

Change-Id: Iee7a951351448f07c5e4c92d3b034e5a8377cf5f

7 years agoavrc: Fix AVRC_MsgReq() msg_mask bug am: ebfeca0a62 am: b2a6393982
Greg Kaiser [Tue, 13 Sep 2016 23:08:06 +0000 (23:08 +0000)]
avrc: Fix AVRC_MsgReq() msg_mask bug am: ebfeca0a62 am: b2a6393982
am: 4d4b7bda7a

Change-Id: I651e29d98d9dd85ece0b0cda4d863ff9c2f9a332

7 years agoavrc: Fix AVRC_MsgReq() msg_mask bug am: ebfeca0a62
Greg Kaiser [Tue, 13 Sep 2016 23:05:35 +0000 (23:05 +0000)]
avrc: Fix AVRC_MsgReq() msg_mask bug am: ebfeca0a62
am: b2a6393982

Change-Id: Ic0a573f023dffb2b2e210dea87ec6eedece45c39

7 years agoavrc: Fix AVRC_MsgReq() msg_mask bug
Greg Kaiser [Tue, 13 Sep 2016 23:02:36 +0000 (23:02 +0000)]
avrc: Fix AVRC_MsgReq() msg_mask bug
am: ebfeca0a62

Change-Id: I45dc17b9e45d8cdabcf1c546d63988bf048a54a2

7 years agoA2DP related API update and cleanup am: d7ff47cc64 am: d63b36d26c
Pavlin Radoslavov [Tue, 13 Sep 2016 20:59:16 +0000 (20:59 +0000)]
A2DP related API update and cleanup am: d7ff47cc64 am: d63b36d26c
am: 0e9e125e54

Change-Id: I8346c4fea35433fed9c70e5c6376a77cb5e64029

7 years agoA2DP related API update and cleanup am: d7ff47cc64
Pavlin Radoslavov [Tue, 13 Sep 2016 20:48:29 +0000 (20:48 +0000)]
A2DP related API update and cleanup am: d7ff47cc64
am: d63b36d26c

Change-Id: I079650e31dac9a5aa44392db3a04012cd269591a

7 years agoA2DP related API update and cleanup
Pavlin Radoslavov [Tue, 13 Sep 2016 20:45:00 +0000 (20:45 +0000)]
A2DP related API update and cleanup
am: d7ff47cc64

Change-Id: Ie71c7ca4a6c4666dffb31b74516f324ba0f5a267

7 years agoavrc: Fix AVRC_MsgReq() msg_mask bug
Greg Kaiser [Tue, 13 Sep 2016 15:07:04 +0000 (08:07 -0700)]
avrc: Fix AVRC_MsgReq() msg_mask bug

msg_mask is intended to be a bit field.  But by declaring it a
bool, we end up turning all bit values into 1, and losing the
other bit values.  We fix this by properly declaring this as
a uint8_t.

Bug:31273148
Change-Id: Id95e1853ea1ad4fbebc35fdc24708765f1fd9e07

7 years agoA2DP related API update and cleanup
Pavlin Radoslavov [Thu, 8 Sep 2016 18:27:46 +0000 (11:27 -0700)]
A2DP related API update and cleanup

* Added new A2DP API and use it as appropriate
  - A2D_GetTrackFrequency()
  - A2D_GetTrackChannelCount()
  - A2D_GetNumberOfSubbands()
  - A2D_GetNumberOfBlocks()
  - A2D_GetAllocationMethodCode()
  - A2D_GetChannelModeCode()
  - A2D_GetSamplingFrequencyCode()
  - A2D_GetSinkTrackChannelType()
  - A2D_GetSinkFramesCountToProcess()

* Added corresponding unit tests for the new API

Also, A2DP related cleanup:
 - Renamed A2D_sbc_dump_codec_info to A2D_DumpCodecInfoSbc()
 - Changed the order of tA2D_SBC_CIE.min_bitpool and
   tA2D_SBC_CIE.max_bitpool to reflect the order of the corresponding
   fields in the Bluetooth spec (A2DP spec v1.3, page 21).
 - Added new API A2D_GetMediaType() and the corresponding unit test
 - Renamed AVDT_MEDIA_AUDIO to AVDT_MEDIA_TYPE_AUDIO
 - Renamed tA2D_SBC_CIE.alloc_mthd to alloc_method
 - Renamed A2D_BAD_ALLOC_MTHD to A2D_BAD_ALLOC_METHOD
 - Renamed A2D_NS_ALLOC_MTHD to A2D_NS_ALLOC_METHOD
 - Eliminated usage of A2D_MEDIA_TYPE_AUDIO and replace it with
   AVDT_MEDIA_TYPE_AUDIO.
    Now the media_type value everywhere is the AVDT_MEDIA_TYPE_* value
    without the reserved 4 bits (LSBs).
 - Fixed macro defines in file "stack/avdt/avdt_defs.h"

Bug: 30958229
Change-Id: Id82653e9c9460aeb92d942a9179bb5abdb4bfdec

7 years agoFix advertising timers am: a8fcd684da am: b029c039e6
Jakub Pawlowski [Tue, 13 Sep 2016 10:25:43 +0000 (10:25 +0000)]
Fix advertising timers am: a8fcd684da am: b029c039e6
am: 1dd7300d9b

Change-Id: I84099678a7f691525251e437785f1a9864955817

7 years agoFix advertising timers am: a8fcd684da
Jakub Pawlowski [Tue, 13 Sep 2016 10:22:42 +0000 (10:22 +0000)]
Fix advertising timers am: a8fcd684da
am: b029c039e6

Change-Id: Id91eb29b098c817c9dbbcf652a638ebc6e818e0b

7 years agoFix advertising timers
Jakub Pawlowski [Tue, 13 Sep 2016 10:19:42 +0000 (10:19 +0000)]
Fix advertising timers
am: a8fcd684da

Change-Id: I752d36909feb7c2e2d7c5cc6a2f8b15e487dbc68

7 years agoBluetooth: split setting params and enabling advertising (3/3) am: 73679d01c7 am...
Jakub Pawlowski [Tue, 13 Sep 2016 08:40:46 +0000 (08:40 +0000)]
Bluetooth: split setting params and enabling  advertising (3/3) am: 73679d01c7 am: 1593e25808
am: c5dec2d049

Change-Id: Iab1490e79c7e06fad53f85b7f3e5f8b12b2f7b0f

7 years agoFix advertising timers
Jakub Pawlowski [Thu, 8 Sep 2016 11:58:09 +0000 (04:58 -0700)]
Fix advertising timers

Right now, timers that rotate advertising address are started when stack
is starting and keep running all the time even when advertising is not
used. This patch fix that by starting the timer when advertising
instance is registered, and stopping it when it's unregistered.

Bug: 30622771
Change-Id: I638176bdc2f26c62d5ec3a56f6e81cd9c016df0b

7 years agoBluetooth: split setting params and enabling advertising (3/3) am: 73679d01c7
Jakub Pawlowski [Tue, 13 Sep 2016 08:38:11 +0000 (08:38 +0000)]
Bluetooth: split setting params and enabling  advertising (3/3) am: 73679d01c7
am: 1593e25808

Change-Id: Ia5623f077fda9c727c38f38f467cc8532799dfd5

7 years agoBluetooth: split setting params and enabling advertising (3/3)
Jakub Pawlowski [Tue, 13 Sep 2016 08:35:38 +0000 (08:35 +0000)]
Bluetooth: split setting params and enabling  advertising (3/3)
am: 73679d01c7

Change-Id: Iaba2b31418ff52a9dd6ac9dc8383f9dcc676c0d1

7 years agoBluetooth: split setting params and enabling advertising (3/3)
Jakub Pawlowski [Thu, 18 Aug 2016 21:42:54 +0000 (14:42 -0700)]
Bluetooth: split setting params and enabling  advertising (3/3)

Proper order of commands when starting advertising:
* set parameters
* set data
* enable advertising

This cannot be achieved when setting advertising parameters and enabling
advertising is put together in one function. Enabling before setting
data might cause first advertisements to be empty. If a device with
hardware filter pick up such advertisement, it might fail to properly
recognize our device.

Bug: 30622771
Bug: 19372779
Change-Id: I3a2c1171e301ecfd7cbf1cb8b86cfda0e5fc2382

7 years agoMerge "test_vendor: White space fix in vendor manager" am: f6c30e115c am: 44634a6c9b
Myles Watson [Tue, 13 Sep 2016 03:11:52 +0000 (03:11 +0000)]
Merge "test_vendor: White space fix in vendor manager" am: f6c30e115c am: 44634a6c9b
am: d544fcfa3c

Change-Id: I767b9a3d377651a2fe6b3069f53777915a976cc8

7 years agoMerge "test_vendor: White space fix in vendor manager" am: f6c30e115c
Myles Watson [Tue, 13 Sep 2016 03:09:15 +0000 (03:09 +0000)]
Merge "test_vendor: White space fix in vendor manager" am: f6c30e115c
am: 44634a6c9b

Change-Id: I4164ec8d14343c7c02d436f31d426f57f5f3e53c

7 years agoMerge "test_vendor: White space fix in vendor manager"
Myles Watson [Tue, 13 Sep 2016 03:06:45 +0000 (03:06 +0000)]
Merge "test_vendor: White space fix in vendor manager"
am: f6c30e115c

Change-Id: I7799006694c88c5ea5cd2303312d94ad8419852d

7 years agoMerge "test_vendor: Silence packet_stream.cc" am: 85dba1c476 am: 59505e4249
Myles Watson [Tue, 13 Sep 2016 03:03:52 +0000 (03:03 +0000)]
Merge "test_vendor: Silence packet_stream.cc" am: 85dba1c476 am: 59505e4249
am: 63d6048213

Change-Id: I45ca68574b02ee742d6ddc7b75695e99bc6aedee

7 years agoMerge "test_vendor: White space fix in vendor manager"
Treehugger Robot [Tue, 13 Sep 2016 03:03:35 +0000 (03:03 +0000)]
Merge "test_vendor: White space fix in vendor manager"

7 years agoMerge "test_vendor: Silence packet_stream.cc" am: 85dba1c476
Myles Watson [Tue, 13 Sep 2016 03:01:15 +0000 (03:01 +0000)]
Merge "test_vendor: Silence packet_stream.cc" am: 85dba1c476
am: 59505e4249

Change-Id: I0012d81d90305f42f411d37490755f05e77277d5

7 years agoMerge "test_vendor: Silence packet_stream.cc"
Myles Watson [Tue, 13 Sep 2016 02:58:44 +0000 (02:58 +0000)]
Merge "test_vendor: Silence packet_stream.cc"
am: 85dba1c476

Change-Id: Iea952846e306e6ea937efe81492315b3ab692919

7 years agoMerge "test_vendor: Silence packet_stream.cc"
Treehugger Robot [Tue, 13 Sep 2016 02:53:16 +0000 (02:53 +0000)]
Merge "test_vendor: Silence packet_stream.cc"

7 years agoMerge "Extended the A2DP codec abstraction API" am: b4eb64344a am: f1284f2ff9
Pavlin Radoslavov [Tue, 13 Sep 2016 02:14:50 +0000 (02:14 +0000)]
Merge "Extended the A2DP codec abstraction API" am: b4eb64344a am: f1284f2ff9
am: 746aacabd1

Change-Id: Ibfc609f8f7a744de4804091d7a6f27216fca69f1

7 years agoMerge "Extended the A2DP codec abstraction API" am: b4eb64344a
Pavlin Radoslavov [Tue, 13 Sep 2016 02:11:42 +0000 (02:11 +0000)]
Merge "Extended the A2DP codec abstraction API" am: b4eb64344a
am: f1284f2ff9

Change-Id: Ic959706ba25741f64f524ad478aa1fd075b97779

7 years agotest_vendor: Move checks for vendor_manager_ am: 9cd5cd2856 am: ec6ed512ff
Jorge E. Moreira [Tue, 13 Sep 2016 02:10:03 +0000 (02:10 +0000)]
test_vendor: Move checks for vendor_manager_ am: 9cd5cd2856 am: ec6ed512ff
am: 6a902c7d21

Change-Id: I0d3d53d1da25b30b105b6226985aef8b6d40e6bb

7 years agoMerge "Extended the A2DP codec abstraction API"
Pavlin Radoslavov [Tue, 13 Sep 2016 02:09:11 +0000 (02:09 +0000)]
Merge "Extended the A2DP codec abstraction API"
am: b4eb64344a

Change-Id: I2d007ad343d74c911abe4f8d6a05724f84a368a4

7 years agotest_vendor: Move checks for vendor_manager_ am: 9cd5cd2856
Jorge E. Moreira [Tue, 13 Sep 2016 02:07:01 +0000 (02:07 +0000)]
test_vendor: Move checks for vendor_manager_ am: 9cd5cd2856
am: ec6ed512ff

Change-Id: I1ee2f113ce4d0668c2f941924d64da63f8bb0023

7 years agoMerge "Extended the A2DP codec abstraction API"
Treehugger Robot [Tue, 13 Sep 2016 02:06:30 +0000 (02:06 +0000)]
Merge "Extended the A2DP codec abstraction API"

7 years agotest_vendor: Move checks for vendor_manager_
Jorge E. Moreira [Tue, 13 Sep 2016 02:04:02 +0000 (02:04 +0000)]
test_vendor: Move checks for vendor_manager_
am: 9cd5cd2856

Change-Id: I1a1f97d2055d1eabbfb7dad3c552e56b7765114f

8 years agotest_vendor: White space fix in vendor manager
Myles Watson [Fri, 9 Sep 2016 22:56:31 +0000 (15:56 -0700)]
test_vendor: White space fix in vendor manager

Change-Id: I00f2e40ba29a84fd3733b99abafc8e5b9961de7d

8 years agoExtended the A2DP codec abstraction API
Pavlin Radoslavov [Thu, 8 Sep 2016 04:57:47 +0000 (21:57 -0700)]
Extended the A2DP codec abstraction API

 * Added new A2DP codec-independent API and updated/renamed existing API.
   - A2D_InitCodecConfig()
   - A2D_InitDefaultCodec()
   - A2D_SetCodec()
   - A2D_IsCodecSupported() -> A2D_IsSourceCodecSupported()
   - A2D_IsSinkCodecSupported()
   - A2D_BuildSrc2SinkConfig() - previously bta_av_build_src_cfg()
   - A2D_IsSinkCodecSupported() - previously
       bta_av_co_audio_sink_supports_config()
   - A2D_IsSourceCodecSupported() - previously
       bta_av_co_audio_media_supports_config()
   - A2D_IsPeerSourceCodecSupported()
   - A2D_GetDefaultConfigSbc() - to be deleted
   - A2D_CodecSepIndexStr()

 * Added the corresponding SBC-specific implementation and a placeholder
   for vendor implementation.

 * Added the corresponding unit tests

Also:
 * Added type tA2D_CODEC_SEP_INDEX and list each known codec (Source or Sink):
   A2D_CODEC_SEP_INDEX_*
 * Renamed BTIF_SV_AV_AA_SBC_INDEX -> A2D_CODEC_SEP_INDEX_SBC
 * Renamed BTIF_SV_AV_AA_SBC_SINK_INDEX -> A2D_CODEC_SEP_INDEX_SBC_SINK
 * Renamed BTA_AV_MAX_SEPS -> A2D_CODEC_SEP_INDEX_MAX
 * Renamed tA2D_CODEC -> tA2D_CODEC_TYPE
 * Renamed tBTIF_AV_MEDIA_FEEDINGS -> tA2D_AV_MEDIA_FEEDINGS
 * Renamed tBTIF_AV_CODEC_ID -> tA2D_AV_CODEC_ID (to be deleted)
 * Renamed BTIF_AV_CODEC_PCM -> tA2D_AV_CODEC_PCM (to be deleted)
 * Renamed BTIF_AV_CODEC_NONE -> tA2D_AV_CODEC_NONE (to be deleted)
 * tBTIF_AV_MEDIA_FEED_CFG_PCM -> tA2D_AV_MEDIA_FEED_CFG_PCM (to be
   deleted)
 * tBTIF_AV_MEDIA_FEED_CFG -> tA2D_AV_MEDIA_FEED_CFG (to be deleted)
 * Moved SBC codec-related configuration and capabilities from
   btif/co/bta_av_co.cc to stack/a2dp/a2d_sbc.c :
   - bta_av_co_sbc_caps -> a2d_sbc_caps
   - bta_av_co_sbc_sink_caps -> a2d_sbc_sink_caps
   - btif_av_sbc_default_config -> a2d_sbc_default_config
 * Replaced usage of BTIF_AV_SBC_DEFAULT_SAMP_FREQ with
   A2D_SBC_IE_SAMP_FREQ_44
 * Merged bta_av_sbc_cfg_matches_cap() and bta_av_sbc_cfg_in_cap()
   into A2D_CodecInfoMatchesCapabilitySbc()
 * Misc other fixes and cleanup: use tA2D_STATUS as appropriate, remove
   FUNC_TRACE(), etc.

Bug: 30958229
Change-Id: I35e224754041cdce479c87e57d8e2c8b3adc8edd

8 years agotest_vendor: Silence packet_stream.cc
Myles Watson [Wed, 13 Jul 2016 00:01:57 +0000 (17:01 -0700)]
test_vendor: Silence packet_stream.cc

Only log if Events report the wrong size.

Change-Id: I3c06e94298f7341a940bb6d5106c869746bdaa78

8 years agotest_vendor: Move checks for vendor_manager_
Jorge E. Moreira [Mon, 12 Sep 2016 22:03:41 +0000 (15:03 -0700)]
test_vendor: Move checks for vendor_manager_

Only some vendor operations use vendor_manager_.  Move the checks into
the operations that use it.

Change-Id: I8bb23d740c94df7e2081c29b1d9e062c5c012714

8 years agoAdded void keyword to function declaration and definition am: 2c8ddc6788 am: b949c97a2c
Jack He [Mon, 12 Sep 2016 21:29:45 +0000 (21:29 +0000)]
Added void keyword to function declaration and definition am: 2c8ddc6788 am: b949c97a2c
am: a533b8798b

Change-Id: I4d384b0df853c927cf8aa8d0e827631efcfccb3b

8 years agoAdded void keyword to function declaration and definition am: 2c8ddc6788
Jack He [Mon, 12 Sep 2016 21:10:58 +0000 (21:10 +0000)]
Added void keyword to function declaration and definition am: 2c8ddc6788
am: b949c97a2c

Change-Id: Ibd00c3a9250bedeb3c6f213b2e4bad9ded7837f7

8 years agoAdded void keyword to function declaration and definition
Jack He [Mon, 12 Sep 2016 21:01:40 +0000 (21:01 +0000)]
Added void keyword to function declaration and definition
am: 2c8ddc6788

Change-Id: I79d50cfe9b809b7fb3459f09b9a681430564216c

8 years agoAdded void keyword to function declaration and definition
Jack He [Mon, 12 Sep 2016 18:36:52 +0000 (11:36 -0700)]
Added void keyword to function declaration and definition

Change-Id: I79ac76e64e836551cfd555a7b9786d254fcbc07a

8 years agotest_vendor: Remove using directives from headers am: b7d64b2071 am: f93626b7ed
Myles Watson [Fri, 9 Sep 2016 21:51:06 +0000 (21:51 +0000)]
test_vendor: Remove using directives from headers am: b7d64b2071 am: f93626b7ed
am: a1396ef341

Change-Id: Ic3270f4a4387b2f48c95c9872cba66d03c2c07d3

8 years agotest_vendor: Use BtAddress instead of vectors am: 3be0c20a70 am: d13774c859
Myles Watson [Fri, 9 Sep 2016 21:51:03 +0000 (21:51 +0000)]
test_vendor: Use BtAddress instead of vectors am: 3be0c20a70 am: d13774c859
am: 95502177b4

Change-Id: Icd472d6847dbc15eade35c148b0d7cc88c5f014b

8 years agotest_vendor: Remove using directives from headers am: b7d64b2071
Myles Watson [Fri, 9 Sep 2016 21:48:05 +0000 (21:48 +0000)]
test_vendor: Remove using directives from headers am: b7d64b2071
am: f93626b7ed

Change-Id: I8289cd405d67042626aca9e609331cd1e3bc20eb

8 years agotest_vendor: Use BtAddress instead of vectors am: 3be0c20a70
Myles Watson [Fri, 9 Sep 2016 21:48:03 +0000 (21:48 +0000)]
test_vendor: Use BtAddress instead of vectors am: 3be0c20a70
am: d13774c859

Change-Id: I3ec0dc1962967df935dac982a9aee4350cfc0c45

8 years agotest_vendor: Remove using directives from headers
Myles Watson [Fri, 9 Sep 2016 21:45:07 +0000 (21:45 +0000)]
test_vendor: Remove using directives from headers
am: b7d64b2071

Change-Id: Ide1343b07810040c8e994ef9df7e37d406ec2683

8 years agotest_vendor: Use BtAddress instead of vectors
Myles Watson [Fri, 9 Sep 2016 21:45:03 +0000 (21:45 +0000)]
test_vendor: Use BtAddress instead of vectors
am: 3be0c20a70

Change-Id: Ied59064b505905c02a29adfc53e21ca4206250de

8 years agotest_vendor: Remove using directives from headers
Myles Watson [Mon, 29 Aug 2016 15:19:19 +0000 (08:19 -0700)]
test_vendor: Remove using directives from headers

Change-Id: I83358cbb68b10e80e4e553a6657fcb38cfcb928f
Signed-off-by: Myles Watson <mylesgw@google.com>
8 years agotest_vendor: Use BtAddress instead of vectors
Myles Watson [Mon, 29 Aug 2016 15:17:25 +0000 (08:17 -0700)]
test_vendor: Use BtAddress instead of vectors

Change-Id: I229f2a4f93a9219a502960e6d91f514738f3b3c8
Signed-off-by: Myles Watson <mylesgw@google.com>
8 years agotest_vendor: Remove unused extern statements am: 265316f78c am: 0418d5a4f4
Myles Watson [Fri, 9 Sep 2016 17:54:25 +0000 (17:54 +0000)]
test_vendor: Remove unused extern statements am: 265316f78c am: 0418d5a4f4
am: 49a5faa63f

Change-Id: I214499bf281e21cca53f077b9292c7addeef45b6

8 years agotest_vendor: Remove unused extern statements am: 265316f78c
Myles Watson [Fri, 9 Sep 2016 17:51:20 +0000 (17:51 +0000)]
test_vendor: Remove unused extern statements am: 265316f78c
am: 0418d5a4f4

Change-Id: I7e6f65fb0b5b7357f543b11e5681960bfc3b6230

8 years agotest_vendor: Remove unused extern statements
Myles Watson [Fri, 9 Sep 2016 17:48:51 +0000 (17:48 +0000)]
test_vendor: Remove unused extern statements
am: 265316f78c

Change-Id: Id0b0d5be188bd14764ceb3cadd5cd8c27d8872ef

8 years agotest_vendor: Remove unused extern statements
Myles Watson [Mon, 29 Aug 2016 14:30:48 +0000 (07:30 -0700)]
test_vendor: Remove unused extern statements

It should be safe to include C header files without
using extern.

Change-Id: I2b562ef3f76df9f9dac69323345ed3d3610e8bc2
Signed-off-by: Myles Watson <mylesgw@google.com>
8 years agoMove all advertising related code into one file am: b0897559c3 am: e4089a8d5e
Jakub Pawlowski [Thu, 8 Sep 2016 20:42:33 +0000 (20:42 +0000)]
Move all advertising related code into one file am: b0897559c3 am: e4089a8d5e
am: c07e7b3e49

Change-Id: I779098a5b01d6b1c4c64ebf51c5c95c80b3131c2

8 years agoMove all advertising related code into one file am: b0897559c3
Jakub Pawlowski [Thu, 8 Sep 2016 20:39:33 +0000 (20:39 +0000)]
Move all advertising related code into one file am: b0897559c3
am: e4089a8d5e

Change-Id: I361c6656e604785f8fe200f80d9e95d4e8d0bdca

8 years agoMove all advertising related code into one file
Jakub Pawlowski [Thu, 8 Sep 2016 20:37:02 +0000 (20:37 +0000)]
Move all advertising related code into one file
am: b0897559c3

Change-Id: I7050da5e21e27b12e0de9530476fdaa5b50db79a

8 years agoMove all advertising related code into one file
Jakub Pawlowski [Wed, 7 Sep 2016 17:53:18 +0000 (10:53 -0700)]
Move all advertising related code into one file

This patch moves btm_ble_adv_raddr_timer_timeout into same file that use
it. It also moves all structures related to multi-advertising into only
source file that uses them, to make sure noone uses them externally
while they undergo further refactoring.

Bug: 30622771
Change-Id: I721d222aa8f5317620c616cc59ee04b7b28a68b3

8 years agotest_vendor: Refactor controller timing am: caa53d094c am: 4d2c850154
Myles Watson [Thu, 8 Sep 2016 17:10:20 +0000 (17:10 +0000)]
test_vendor: Refactor controller timing am: caa53d094c am: 4d2c850154
am: 2b96d501bd

Change-Id: I2122132294c7103cc40e98c17a176b597a4b9872

8 years agotest_vendor: Refactor controller timing am: caa53d094c
Myles Watson [Thu, 8 Sep 2016 17:07:51 +0000 (17:07 +0000)]
test_vendor: Refactor controller timing am: caa53d094c
am: 4d2c850154

Change-Id: Ie695304b2f3022406c3b590fa04ca88380ffe250

8 years agotest_vendor: Refactor controller timing
Myles Watson [Thu, 8 Sep 2016 17:05:22 +0000 (17:05 +0000)]
test_vendor: Refactor controller timing
am: caa53d094c

Change-Id: Icc42613ca45a2140461a92eafc9809aa29edc24d

8 years agotest_vendor: Refactor controller timing
Myles Watson [Thu, 16 Jun 2016 10:54:23 +0000 (03:54 -0700)]
test_vendor: Refactor controller timing

Use AsyncManager to implement a timer tick and an event queue.

Change-Id: Iec2a0ef06f17ecce0652ecc52f5ef732fc4af026
Signed-off-by: Myles Watson <mylesgw@google.com>
8 years agoUse proper type in filter init am: 803fb5db92 am: 1fdd0b9e81
Jakub Pawlowski [Wed, 7 Sep 2016 17:31:15 +0000 (17:31 +0000)]
Use proper type in filter init am: 803fb5db92 am: 1fdd0b9e81
am: 9dbb37694b

Change-Id: Ic0600325f73bcdd4446c54430be53e729f0618aa

8 years agoUse proper type in filter init am: 803fb5db92
Jakub Pawlowski [Wed, 7 Sep 2016 17:28:45 +0000 (17:28 +0000)]
Use proper type in filter init am: 803fb5db92
am: 1fdd0b9e81

Change-Id: Icc80bdb3fa60d892463a5784d2d00fa740ca87f6

8 years agoUse proper type in filter init
Jakub Pawlowski [Wed, 7 Sep 2016 17:26:14 +0000 (17:26 +0000)]
Use proper type in filter init
am: 803fb5db92

Change-Id: I63283f1cf5acea4ab2feb4b0ce1b991b9b1e4022

8 years agoUse proper type in filter init
Jakub Pawlowski [Mon, 5 Sep 2016 16:11:27 +0000 (09:11 -0700)]
Use proper type in filter init

Change-Id: I429ea832f32cb4c67525dda71f9e05ba60110e1e

8 years agoMerge "Updating QDID to reflect the certfication done for N." am: 66244795b0 am:...
pkanwar [Wed, 7 Sep 2016 01:35:20 +0000 (01:35 +0000)]
Merge "Updating QDID to reflect the certfication done for N." am: 66244795b0 am: 92f129a72c
am: 462e867d41

Change-Id: I43a0e96dcbd86b79b2160f090cb773e26127782e

8 years agoMerge "Updating QDID to reflect the certfication done for N." am: 66244795b0
pkanwar [Wed, 7 Sep 2016 01:32:49 +0000 (01:32 +0000)]
Merge "Updating QDID to reflect the certfication done for N." am: 66244795b0
am: 92f129a72c

Change-Id: I5e6c5e17f9ba8a8da6685ed64a689e94e4b40eb5

8 years agoMerge "Updating QDID to reflect the certfication done for N."
pkanwar [Wed, 7 Sep 2016 01:30:19 +0000 (01:30 +0000)]
Merge "Updating QDID to reflect the certfication done for N."
am: 66244795b0

Change-Id: I218d1208aa3975ee8e61226ed632f766fba76068

8 years agoMerge "Updating QDID to reflect the certfication done for N."
Treehugger Robot [Wed, 7 Sep 2016 01:24:09 +0000 (01:24 +0000)]
Merge "Updating QDID to reflect the certfication done for N."

8 years agoUpdating QDID to reflect the certfication done for N. am: a1e4dd95ea
pkanwar [Tue, 6 Sep 2016 22:33:46 +0000 (22:33 +0000)]
Updating QDID to reflect the certfication done for N. am: a1e4dd95ea
am: bbc66bc77f

Change-Id: I0331df6b7a4c35db1ab92572d20d0af0b00d9412

8 years agoUpdating QDID to reflect the certfication done for N.
pkanwar [Tue, 6 Sep 2016 22:29:58 +0000 (22:29 +0000)]
Updating QDID to reflect the certfication done for N.
am: a1e4dd95ea

Change-Id: Ic057ec7cc1ffc73073f35c1d7c828c3904a5065d