OSDN Git Service

android-x86/system-bt.git
7 years agoFix HDP select thread id type am: f28952970e
Andre Eisenbach [Fri, 17 Feb 2017 03:00:05 +0000 (03:00 +0000)]
Fix HDP select thread id type am: f28952970e
am: 6c1929f588

Change-Id: Id4473f3db0f99789ad700101545aae349ae13a8a

7 years agoFix HDP select thread id type
Andre Eisenbach [Fri, 17 Feb 2017 02:55:04 +0000 (02:55 +0000)]
Fix HDP select thread id type
am: f28952970e

Change-Id: I3171422ec9bfd8a0937ef500c9fc85b0af70b4e1

7 years agoFix HDP select thread id type
Andre Eisenbach [Fri, 17 Feb 2017 02:38:25 +0000 (18:38 -0800)]
Fix HDP select thread id type

Recent changes in libbionic cause pthread_join to SIGABRT if called with
an invalid thread id. The select_thread_id variable in the HDP
sub-system was truncated from long->int causing pthread_join to not find
the correct thread and triggering the error.

Using the correct type for select_thread_id fixes this problem.

Change-Id: Id332fa86cf7f30abd211588d32899d41e157b462
Fixes: 35432169
Test: manual; boot device, turn BT off; ensure it stays off

7 years agoMerge "Add a mutex to guard all btsnoop operations" am: d8a0667363
Pavlin Radoslavov [Thu, 16 Feb 2017 22:26:18 +0000 (22:26 +0000)]
Merge "Add a mutex to guard all btsnoop operations" am: d8a0667363
am: 0c5b10be09

Change-Id: Ie42a94583e0d65170b0b1a7477b1d05927ffb1aa

7 years agoMerge "Add a mutex to guard all btsnoop operations"
Pavlin Radoslavov [Thu, 16 Feb 2017 22:21:46 +0000 (22:21 +0000)]
Merge "Add a mutex to guard all btsnoop operations"
am: d8a0667363

Change-Id: I1ba7c525e9cd24fd5d5d588b0b950e1cc39a785f

7 years agoMerge "Add a mutex to guard all btsnoop operations"
Treehugger Robot [Thu, 16 Feb 2017 22:14:23 +0000 (22:14 +0000)]
Merge "Add a mutex to guard all btsnoop operations"

7 years agoMerge changes Idcbbc7eb,I3dc48800 am: 6f04f03f44
Jakub Pawlowski [Thu, 16 Feb 2017 20:19:25 +0000 (20:19 +0000)]
Merge changes Idcbbc7eb,I3dc48800 am: 6f04f03f44
am: 9f0ff40820

Change-Id: Ie63d140ad279fe66f71515242bb65f4d43d0c279

7 years agoFix advertise data parsing am: 2e97666062
Jakub Pawlowski [Thu, 16 Feb 2017 20:19:11 +0000 (20:19 +0000)]
Fix advertise data parsing am: 2e97666062
am: aacdc55171

Change-Id: I7ed5f1725a722062042e296d9e93e0e9a7a807a9

7 years agoMerge changes Idcbbc7eb,I3dc48800
Jakub Pawlowski [Thu, 16 Feb 2017 20:15:22 +0000 (20:15 +0000)]
Merge changes Idcbbc7eb,I3dc48800
am: 6f04f03f44

Change-Id: I690e029727e74f6c948ff29be79f2c90645d5a9c

7 years agoFix advertise data parsing
Jakub Pawlowski [Thu, 16 Feb 2017 20:15:05 +0000 (20:15 +0000)]
Fix advertise data parsing
am: 2e97666062

Change-Id: Ia196299b560036813eaf4b2268e5d1dd720943ce

7 years agoMerge changes Idcbbc7eb,I3dc48800
Jakub Pawlowski [Thu, 16 Feb 2017 20:09:52 +0000 (20:09 +0000)]
Merge changes Idcbbc7eb,I3dc48800

* changes:
  Use LE Extended Create Connection when possible
  Add LE Extended Create Connection HCI command

7 years agoAdd a mutex to guard all btsnoop operations
Pavlin Radoslavov [Thu, 16 Feb 2017 19:51:48 +0000 (11:51 -0800)]
Add a mutex to guard all btsnoop operations

After switching to HIDL, capture() can be called by multiple threads.
Capturing a packet and writing to the btsnoop/btsnooz logs
require multiple operations, hence we need a mutex to make those
operations atomic.
Previously, there were occasional btsnoop_hci.log files
with corrupted data as reported by Wireshark.

Test: Manual - captured multiple btsnoops_hci.log files.
Change-Id: Ib89d9156ad7e27a7dee652f71a0cf38c85d4447c

7 years agoUse LE Extended Create Connection when possible
Jakub Pawlowski [Thu, 16 Feb 2017 15:12:22 +0000 (07:12 -0800)]
Use LE Extended Create Connection when possible

Bug: 30622771
Test: manual
Change-Id: Idcbbc7eb6f9b32b2f258d6f8913ead6986510da8

7 years agoAdd LE Extended Create Connection HCI command
Jakub Pawlowski [Wed, 15 Feb 2017 16:35:30 +0000 (08:35 -0800)]
Add LE Extended Create Connection HCI command

Bug: 30622771
Test: manual
Change-Id: I3dc48800bd2dfb2f00c824c89888c9f4e8271497

7 years agoFix advertise data parsing
Jakub Pawlowski [Thu, 16 Feb 2017 17:23:48 +0000 (09:23 -0800)]
Fix advertise data parsing

This patch fixes overflow of position variable, and possible read
outside of vector boundaries when parsing advertise data.

Parsing 1004 bytes of hex "112233112233.." was causing infinite loop.

Bug: 30622771
Test: manual
Change-Id: I0d669f7958de73f5d53350fb293ff27fea172f44

7 years agoHID: Fix scroll issue with Apple Magic Mouse am: 3e2201163b
Hemant Gupta [Thu, 16 Feb 2017 15:37:48 +0000 (15:37 +0000)]
HID: Fix scroll issue with Apple Magic Mouse am: 3e2201163b
am: 266f1f8335

Change-Id: Ifc1101137398845aa86b46ce3f06348016071a66

7 years agoHID: Fix scroll issue with Apple Magic Mouse
Hemant Gupta [Thu, 16 Feb 2017 15:33:48 +0000 (15:33 +0000)]
HID: Fix scroll issue with Apple Magic Mouse
am: 3e2201163b

Change-Id: I368798f4084b3cd4126c76707a9dfc6e9b8ea3d1

7 years agoHID: Fix scroll issue with Apple Magic Mouse
Hemant Gupta [Tue, 25 Oct 2016 19:17:57 +0000 (12:17 -0700)]
HID: Fix scroll issue with Apple Magic Mouse

Usecase
1) Pair and connect with Apple Magic Mouse
2) Scroll over HID mouse and see if pointer moves up or down
   on DUT.

Observation:
Scroll functionality does not work on DUT and mouse pointer
stays still.

Root Cause:
From kernel 3.18 onwards, UHID flags are updated and following new
flags are added. Support for handling same is missing in user
space hid driver (bta_hh_co.cc)
UHID_GET_REPORT
UHID_GET_REPORT_REPLY
UHID_SET_REPORT
UHID_SET_REPORT_REPLY

Fix:
Add support for set report and get report in HID user
space because of changes in uhid kernel driver with kernel changes
for kernel 3.18. Apple Magic Mouse scroll functionality does not
work without this fix, as Apple Mouse requires set report from
HID host for it to start working properly wrt Scroll functionality.

Bug: 35306202
Change-Id: I90230b76d68e9275dcacd9f46f03e312ddf2fa30

7 years agoAdd a missing NULL pointer check inside bta_av_rcfg_str_ok() am: c9cff56fea
Pavlin Radoslavov [Wed, 15 Feb 2017 03:59:28 +0000 (03:59 +0000)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok() am: c9cff56fea
am: 22b8ffcda5

Change-Id: I996c38aba138ef98929b887ff2e2f3e42e943c2f

7 years agoAdd a missing NULL pointer check inside bta_av_rcfg_str_ok()
Pavlin Radoslavov [Wed, 15 Feb 2017 03:56:57 +0000 (03:56 +0000)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok()
am: c9cff56fea

Change-Id: I9346b420fe29960640871ae380d0ddb51973523f

7 years agoMerge "Fix SIGBUS error in BT stack when pairing with ARM boards" am: 24dc553b55
Pulkit Bhuwalka [Wed, 15 Feb 2017 01:48:18 +0000 (01:48 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards" am: 24dc553b55
am: dea0ee893c

Change-Id: Idf9adfc5b7cb1b92c246b4ef88b2f85bb4fcc3cc

7 years agoMerge "Fix SIGBUS error in BT stack when pairing with ARM boards"
Pulkit Bhuwalka [Wed, 15 Feb 2017 01:46:18 +0000 (01:46 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards"
am: 24dc553b55

Change-Id: I286d317aa89c363ba1f3baecd4c707211b9411f6

7 years agoAdd a missing NULL pointer check inside bta_av_rcfg_str_ok()
Pavlin Radoslavov [Wed, 15 Feb 2017 01:38:19 +0000 (17:38 -0800)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok()

Apparently, the p_data argument could be NULL if the reconfig
was triggered by the local device.

Test: Tested with Bluetooth headsets
Bug: 35351216
Change-Id: Ic51d849232944b5978772d222c41f66824e14dd4

7 years agoMerge "Fix SIGBUS error in BT stack when pairing with ARM boards"
Treehugger Robot [Wed, 15 Feb 2017 01:39:00 +0000 (01:39 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards"

7 years agoUpdate the A2DP MTU if the L2CAP MTU changes during codec reconfiguration am: 31d373be95
Pavlin Radoslavov [Tue, 14 Feb 2017 23:36:08 +0000 (23:36 +0000)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration am: 31d373be95
am: d964b1ac31

Change-Id: I9f2104a48467d0c8d54322a8bbb67f080c4d61be

7 years agoUpdate the A2DP MTU if the L2CAP MTU changes during codec reconfiguration
Pavlin Radoslavov [Tue, 14 Feb 2017 23:34:08 +0000 (23:34 +0000)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration
am: 31d373be95

Change-Id: I5c897b42abbcf6d14c5c9f74e8e186d3eaff259d

7 years agoFix SIGBUS error in BT stack when pairing with ARM boards
Pulkit Bhuwalka [Tue, 14 Feb 2017 01:44:47 +0000 (17:44 -0800)]
Fix SIGBUS error in BT stack when pairing with ARM boards

Bluetooth stack crashes with a SIGBUS memory unaligned error since the
toolchain optimizes memcpy to generate register instructions which are
unaligned in memory. Similar issue was seen earlier in
https://android-review.googlesource.com/#/c/181713/
which was solved by casting pointers to (void *). That fix misses edge
cases where the destination pointer needs to be casted as well.

Change-Id: I23cc16142deaf3dc1fff91588d736abdfcb3bfde
Fixes: 35154933
Test: Verified by building and pairing with RPI3/NXP Arm boards.

7 years agoUpdate the A2DP MTU if the L2CAP MTU changes during codec reconfiguration
Pavlin Radoslavov [Tue, 14 Feb 2017 20:18:44 +0000 (12:18 -0800)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration

Previously, the MTU was saved inside the AVDTP module after the first
codec setup. However, the MTU wasn't updated after codec reconfiguration.
As a result, if a Sink device uses different (smaller) MTU for
a codec like SBC, then switching fron another codec to SBC will
result in generating SBC frames that are too large to transmit,
and there will be no audio.

Bug: b/35351216
Test: A2DP streaming and codec switch to various Sink devices.
Change-Id: Ieb3caf4ef7a30a7af31ceb2f6132807739829441

7 years agoMerge "Lower the BLE connection supervision timeout to 5s." am: 72caf0257f
Qasim Javed [Tue, 14 Feb 2017 02:35:45 +0000 (02:35 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s." am: 72caf0257f
am: 9056c8cf9d

Change-Id: I6f21dbda3394261573516f2684fef67c5a3d215d

7 years agoMerge "Lower the BLE connection supervision timeout to 5s."
Qasim Javed [Tue, 14 Feb 2017 02:33:44 +0000 (02:33 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s."
am: 72caf0257f

Change-Id: I565c7920cef98cfdaa59e0585734e71587dee579

7 years agoMerge "Lower the BLE connection supervision timeout to 5s."
Treehugger Robot [Tue, 14 Feb 2017 02:26:15 +0000 (02:26 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s."

7 years agoMerge "Change LE advertisement data length type (uint8_t -> uint16_t)" am: f49eebd089
Jakub Pawlowski [Tue, 14 Feb 2017 01:44:47 +0000 (01:44 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)" am: f49eebd089
am: 13a35c0898

Change-Id: If48478b23df412a809178d83a82a0050258ffe4d

7 years agoMerge "Change LE advertisement data length type (uint8_t -> uint16_t)"
Jakub Pawlowski [Tue, 14 Feb 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)"
am: f49eebd089

Change-Id: Iecf2d0e338ec4d30aebbe8c385925076ab630a3c

7 years agoMerge "Change LE advertisement data length type (uint8_t -> uint16_t)"
Jakub Pawlowski [Tue, 14 Feb 2017 01:34:29 +0000 (01:34 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)"

7 years agoFix comment formatting at the beginning of lines am: 0ec947509d
Myles Watson [Tue, 14 Feb 2017 01:17:48 +0000 (01:17 +0000)]
Fix comment formatting at the beginning of lines am: 0ec947509d
am: e77189b5e5

Change-Id: Ib6613d3ea4eafb6701663f711bc684e6aaa25f9a

7 years agoFix comment formatting at the beginning of lines
Myles Watson [Tue, 14 Feb 2017 01:14:44 +0000 (01:14 +0000)]
Fix comment formatting at the beginning of lines
am: 0ec947509d

Change-Id: I1700d82b29714a34b3170b5c6de66f81aaea547b

7 years agoFix comment formatting at the beginning of lines
Myles Watson [Thu, 9 Feb 2017 22:16:52 +0000 (14:16 -0800)]
Fix comment formatting at the beginning of lines

Test: builds
Change-Id: I691a40ad37b0cbe3ce56a09dc986df8857883b23

7 years agoLower the BLE connection supervision timeout to 5s.
Qasim Javed [Mon, 6 Feb 2017 20:16:09 +0000 (12:16 -0800)]
Lower the BLE connection supervision timeout to 5s.

The current default of 20 seconds is too high especially considering
that BLE tries to optimize (re)connection times. A connection
supervision timeout of 20 seconds essentially means that an initiator
of the connection could be in the connecting state for 20 seconds
before giving up on that connection attempt.

Checking other platforms such as iOS for default connection supervision
timeout reveals that they use sub-second (750ms) values.

Change-Id: I6ff7a20ceab0df8986191dd73676cadbe23a175e

7 years agoChange LE advertisement data length type (uint8_t -> uint16_t)
Jakub Pawlowski [Mon, 13 Feb 2017 22:31:52 +0000 (14:31 -0800)]
Change LE advertisement data length type (uint8_t -> uint16_t)

Chained advertisement data can be up to 1650 bytes.

Test: manual
Bug: 30622771
Change-Id: I67af5a8130ac2d3f0dbd8f5e3f28b72b152256c2

7 years agobtif: remove logspam at higher debug levels am: c338fe868c
Marie Janssen [Mon, 13 Feb 2017 22:07:31 +0000 (22:07 +0000)]
btif: remove logspam at higher debug levels am: c338fe868c
am: 9135c237f6

Change-Id: I1bb302465f641efe1a9caacbaac0de12f2cbbd79

7 years agobtif: remove logspam at higher debug levels
Marie Janssen [Mon, 13 Feb 2017 22:04:31 +0000 (22:04 +0000)]
btif: remove logspam at higher debug levels
am: c338fe868c

Change-Id: Icd07fdcccf6267d9ff9e4a27a031f45d7a3d3f18

7 years agobtif: remove logspam at higher debug levels
Marie Janssen [Wed, 1 Feb 2017 20:50:00 +0000 (12:50 -0800)]
btif: remove logspam at higher debug levels

Some CHECK macros had logs that printed the function name, which
duplicated the logs in the functions outside the checks, producing too
many logs.

Remove some unused macros.

Changes:
02-01 09:34:11.757  1259  1755 D bt_btif : get_folder_items_list_rsp
02-01 09:34:11.757  1259  1755 D bt_btif : get_folder_items_list_rsp: item_cnt: 0 len: 0
to
02-01 09:34:11.757  1259  1755 D bt_btif : get_folder_items_list_rsp: item_cnt: 0 len: 0

and similar.

Test: run logcat, check that we have less duplicated logs
Change-Id: Id6e57f38b34d176ed8be0c3baedfbcf55e61a9a4

7 years agoAllow back-to-back AVDTP API_RECONFIG_EVT events am: a72b0e2757
Pavlin Radoslavov [Mon, 13 Feb 2017 17:41:41 +0000 (17:41 +0000)]
Allow back-to-back AVDTP API_RECONFIG_EVT events am: a72b0e2757
am: ebf192bdfa

Change-Id: I35a89889bb669428efc01c25a6565a6b6548720d

7 years agoAllow back-to-back AVDTP API_RECONFIG_EVT events
Pavlin Radoslavov [Mon, 13 Feb 2017 17:39:43 +0000 (17:39 +0000)]
Allow back-to-back AVDTP API_RECONFIG_EVT events
am: a72b0e2757

Change-Id: I17287bb26295cc43c04e00263e4d58e8656a8d7f

7 years agoAllow back-to-back AVDTP API_RECONFIG_EVT events
Pavlin Radoslavov [Sat, 11 Feb 2017 09:20:49 +0000 (01:20 -0800)]
Allow back-to-back AVDTP API_RECONFIG_EVT events

Based on AVDTP Spec 1.3, Section 9.8 StreamChangeParameters, the RECONFIG
procedure (AVDTP_RECONFIGURE_CMD) happens in OPEN state, and there is no
state transition that would prohibit calling the RECONFIG procedure
back-to-back.

Test: A2DP codec reconfiguration and audio play with several Sink devices
Bug: 35284763
Change-Id: Ie4ddca8545e2146fbd863e55713fd2d49994b4b0

7 years agoMerge "osi: Remove unused eager_reader code" am: 8f79930f36
Myles Watson [Sat, 11 Feb 2017 04:16:25 +0000 (04:16 +0000)]
Merge "osi: Remove unused eager_reader code" am: 8f79930f36
am: bcd9c5a5e6

Change-Id: Iee3cfeb9b86b9927544dab78f4edff6096090468

7 years agoMerge "osi: Remove unused eager_reader code"
Myles Watson [Sat, 11 Feb 2017 04:13:30 +0000 (04:13 +0000)]
Merge "osi: Remove unused eager_reader code"
am: 8f79930f36

Change-Id: I976eabd7609710f5acbd882fbf1e57f06673066d

7 years agoMerge "osi: Remove unused eager_reader code"
Treehugger Robot [Sat, 11 Feb 2017 04:09:44 +0000 (04:09 +0000)]
Merge "osi: Remove unused eager_reader code"

7 years agoGet rid of btm_ble_send_extended_scan_params am: defbb91f06
Jakub Pawlowski [Sat, 11 Feb 2017 01:28:54 +0000 (01:28 +0000)]
Get rid of btm_ble_send_extended_scan_params am: defbb91f06
am: 896e6cc77e

Change-Id: I7f78d992842daa591a320b7f6f46bdbf66b2c42e

7 years agoFix set extended scan params command am: 42300f2235
Jakub Pawlowski [Sat, 11 Feb 2017 01:28:42 +0000 (01:28 +0000)]
Fix set extended scan params command am: 42300f2235
am: bb826d724f

Change-Id: Ib1930c9cdeea3d9d5cfa91488f4ed6be3a05112c

7 years agoGet rid of btm_ble_send_extended_scan_params
Jakub Pawlowski [Sat, 11 Feb 2017 01:26:27 +0000 (01:26 +0000)]
Get rid of btm_ble_send_extended_scan_params
am: defbb91f06

Change-Id: I352ab720b1040699bd25ee748d148886a92dcb7d

7 years agoFix set extended scan params command
Jakub Pawlowski [Sat, 11 Feb 2017 01:26:15 +0000 (01:26 +0000)]
Fix set extended scan params command
am: 42300f2235

Change-Id: I871bca8c20130b3d736b682674ead62047a063bc

7 years agoGet rid of btm_ble_send_extended_scan_params
Jakub Pawlowski [Fri, 10 Feb 2017 23:24:00 +0000 (15:24 -0800)]
Get rid of btm_ble_send_extended_scan_params

Bug: 30622771
Test: sl4a FilteringTest
Change-Id: I94e62ca0d785b20f97e3397131b70eac06e15003

7 years agoFix set extended scan params command
Jakub Pawlowski [Fri, 10 Feb 2017 23:17:52 +0000 (15:17 -0800)]
Fix set extended scan params command

scanning_phys is a bitmap, not a count of PHYs. This error was resulting
in invalid HCI command being sent. This had no impact so far, because
only 1M PHY was used.

Bug: 30622771
Test: manual
Change-Id: I2be4f5ddbe0d453dc49cdee4605821b10853d7d8

7 years agoAdd Service Data GAP EIR data type am: 2a2583bdd3
Bailey Forrest [Fri, 10 Feb 2017 18:15:48 +0000 (18:15 +0000)]
Add Service Data GAP EIR data type am: 2a2583bdd3
am: e1403f2990

Change-Id: I263f41199f1e78f91a9e9654cd44e6d97d800433

7 years agoAdd Service Data GAP EIR data type
Bailey Forrest [Fri, 10 Feb 2017 18:13:17 +0000 (18:13 +0000)]
Add Service Data GAP EIR data type
am: 2a2583bdd3

Change-Id: Id9e77ecd8ae5c101379c16e201e9538ab89458c3

7 years agoAdd Service Data GAP EIR data type
Bailey Forrest [Fri, 10 Feb 2017 00:49:15 +0000 (16:49 -0800)]
Add Service Data GAP EIR data type

Test: Build
Change-Id: I378883fdeb09fadaac04ace2dc499abd27b7d3ab

7 years agoMerge "Minor fixes" am: bb952824d1
Bailey Forrest [Fri, 10 Feb 2017 13:54:09 +0000 (13:54 +0000)]
Merge "Minor fixes" am: bb952824d1
am: f4ed8ead35

Change-Id: I6084df1776fd7be3900e0150f229c6cedda0a1ae

7 years agoMerge "Minor fixes"
Bailey Forrest [Fri, 10 Feb 2017 13:51:39 +0000 (13:51 +0000)]
Merge "Minor fixes"
am: bb952824d1

Change-Id: I71a561da11481ceddcc53e7051ea568f821124d3

7 years agoMerge "Minor fixes"
Treehugger Robot [Fri, 10 Feb 2017 13:48:38 +0000 (13:48 +0000)]
Merge "Minor fixes"

7 years agoMerge "Advertising data handling improvements" am: caac63a814
Jakub Pawlowski [Fri, 10 Feb 2017 05:56:13 +0000 (05:56 +0000)]
Merge "Advertising data handling improvements" am: caac63a814
am: e883a96a02

Change-Id: Ie099bd7055d376c85968d6a9a6d7fbb7bb6babd9

7 years agoMerge "Advertising data handling improvements"
Jakub Pawlowski [Fri, 10 Feb 2017 05:49:13 +0000 (05:49 +0000)]
Merge "Advertising data handling improvements"
am: caac63a814

Change-Id: Ice53320def5bfd56de0329465c42e551828c0661

7 years agoMerge "Advertising data handling improvements"
Jakub Pawlowski [Fri, 10 Feb 2017 05:41:05 +0000 (05:41 +0000)]
Merge "Advertising data handling improvements"

7 years agoMerge "Enable DLOG on eng and userdebug builds" am: 0b8c812427
Jakub Pawlowski [Fri, 10 Feb 2017 03:24:03 +0000 (03:24 +0000)]
Merge "Enable DLOG on eng and userdebug builds" am: 0b8c812427
am: fd3e9557c7

Change-Id: Id934eaf1a73d32eabf9de7ff47c21272241abae1

7 years agoMerge "Enable DLOG on eng and userdebug builds"
Jakub Pawlowski [Fri, 10 Feb 2017 03:21:32 +0000 (03:21 +0000)]
Merge "Enable DLOG on eng and userdebug builds"
am: 0b8c812427

Change-Id: I67ecd676087b183f749d5ee7495ede92dd938423

7 years agoMerge "Enable DLOG on eng and userdebug builds"
Treehugger Robot [Fri, 10 Feb 2017 03:15:25 +0000 (03:15 +0000)]
Merge "Enable DLOG on eng and userdebug builds"

7 years agoMinor fixes
Bailey Forrest [Fri, 10 Feb 2017 01:26:28 +0000 (17:26 -0800)]
Minor fixes

- Include <mutex> for heart_rate_server
- Remove unnecessary assignment

Test: Build
Change-Id: Ic2368d08789b95e71c083460148c70b9d0ef0b20

7 years agoAdvertising data handling improvements
Jakub Pawlowski [Tue, 7 Feb 2017 20:15:06 +0000 (12:15 -0800)]
Advertising data handling improvements

* use non-hardcoded advertise data size
* use cache for keeping non-complete advertising data, waiting either
for scan scan response, or secondary channel data.

Bug: 30622771
Test: sl4a FilteringTest
Change-Id: I689edcb4aee30361df15340029559cd19dac552b

7 years agoMerge "Remove build variables that are no longer used" am: f9ea60e015
Jack He [Fri, 10 Feb 2017 01:01:53 +0000 (01:01 +0000)]
Merge "Remove build variables that are no longer used" am: f9ea60e015
am: 23cdcce890

Change-Id: I7e659d0597425ebb5bada5ae64980bb1cccdba92

7 years agoMerge "Remove build variables that are no longer used"
Jack He [Fri, 10 Feb 2017 00:58:24 +0000 (00:58 +0000)]
Merge "Remove build variables that are no longer used"
am: f9ea60e015

Change-Id: Ic47a45bc196acc715e2152ed95510b9e1afb01c8

7 years agoMerge "Remove build variables that are no longer used"
Treehugger Robot [Fri, 10 Feb 2017 00:53:23 +0000 (00:53 +0000)]
Merge "Remove build variables that are no longer used"

7 years agoEnable DLOG on eng and userdebug builds
Jakub Pawlowski [Fri, 10 Feb 2017 00:46:45 +0000 (16:46 -0800)]
Enable DLOG on eng and userdebug builds

Test: manual
Change-Id: I1ff4ad6b2543246351d4d34919ba443e5617a9c0

7 years agoUse same timestamp for on-disk BT Snoop Log and in-memory BT Snooz Log am: 071b507ad4
Jack He [Fri, 10 Feb 2017 00:21:40 +0000 (00:21 +0000)]
Use same timestamp for on-disk BT Snoop Log and in-memory BT Snooz Log am: 071b507ad4
am: ae0c098aaa

Change-Id: I51273b1a197582e4be846cc1980c157721f2536a

7 years agoUse same timestamp for on-disk BT Snoop Log and in-memory BT Snooz Log
Jack He [Fri, 10 Feb 2017 00:19:42 +0000 (00:19 +0000)]
Use same timestamp for on-disk BT Snoop Log and in-memory BT Snooz Log
am: 071b507ad4

Change-Id: Ie19de8d98cdf01ac1b66d146742f19a769969f9f

7 years agoUse same timestamp for on-disk BT Snoop Log and in-memory BT Snooz Log
Jack He [Wed, 8 Feb 2017 01:25:15 +0000 (17:25 -0800)]
Use same timestamp for on-disk BT Snoop Log and in-memory BT Snooz Log

* Logcat uses gettimeofday for its timestamp, the same as on-disk BT
  Snoop log
* Although in-memory BT Snooz Log uses the same method to get time, it
  is calling it separately, resulting in mismatch between timestamps of
  two snoop logs
* This CL let them uses the same timestamp_us value and put the function
  definition to libosi
* Note that preserved on-disk BT Snoop logs timestamp postfix at
      btsnoop_hci_<timestamp>.log
  will be changed to microsecond since epoch at current device timezone
  instead of the shifted BT Snoop timestamp value
* New unit tests for gettimeofday

Bug: 35113514
Test: Make, unit tests, run BT activities and check both snoop logs
Change-Id: I5b3f87bc523b272ced2c69a4595d0e0cbe29bcb3

7 years agoMerge "Guard btsnooz ringbuffer access from multiple threads" am: 82fc2a96ef
Pavlin Radoslavov [Thu, 9 Feb 2017 22:42:39 +0000 (22:42 +0000)]
Merge "Guard btsnooz ringbuffer access from multiple threads" am: 82fc2a96ef
am: 3c7a71dcd2

Change-Id: Ie6a1fe91e12bba1df5ad998b3b9f5ca47a298beb

7 years agoFix AAC bitrate computation and add missing parameters am: 3b8f12614f
Kenmochi, Chisato [Thu, 9 Feb 2017 22:42:28 +0000 (22:42 +0000)]
Fix AAC bitrate computation and add missing parameters am: 3b8f12614f
am: 495467f9af

Change-Id: I232ee1e8b0f7b7b2b9a22ea60411497d3f392391

7 years agoMerge "Guard btsnooz ringbuffer access from multiple threads"
Pavlin Radoslavov [Thu, 9 Feb 2017 22:40:45 +0000 (22:40 +0000)]
Merge "Guard btsnooz ringbuffer access from multiple threads"
am: 82fc2a96ef

Change-Id: I75ad53c392554ea41694a9d314e1503009c076ce

7 years agoFix AAC bitrate computation and add missing parameters
Kenmochi, Chisato [Thu, 9 Feb 2017 22:40:28 +0000 (22:40 +0000)]
Fix AAC bitrate computation and add missing parameters
am: 3b8f12614f

Change-Id: I9ecff0dfe4d804678c6dc5c3bc2fc0f5d0a324ed

7 years agoMerge "Guard btsnooz ringbuffer access from multiple threads"
Pavlin Radoslavov [Thu, 9 Feb 2017 22:35:05 +0000 (22:35 +0000)]
Merge "Guard btsnooz ringbuffer access from multiple threads"

7 years agoRemove build variables that are no longer used
Jack He [Thu, 9 Feb 2017 22:29:59 +0000 (14:29 -0800)]
Remove build variables that are no longer used

* Removed BtHcilpIncluded from BOARD_BLUETOOTH_BDROID_HCILP_INCLUDE
* Removed BtHciUseMct from BLUETOOTH_HCI_USE_MCT

Bug: 3520365334951912
Test: Code compilation, no user visible effects
Change-Id: Ifbb0c2165a2b7cb6ec1d5c87a610219dd010206b

7 years agoFix AAC bitrate computation and add missing parameters
Kenmochi, Chisato [Thu, 9 Feb 2017 20:23:47 +0000 (12:23 -0800)]
Fix AAC bitrate computation and add missing parameters

* Compute the AAC codec bitrate based on the MTU and the AAC
  object type such that the AAC frames are not fragmented.
  The spec recommendation is to avoid fragmentation, and
  some sink devices cannot process fragmented frames.

* Setup/assign AACENC_PEAK_BITRATE as the peak bitrate to
  make sure we never go over the MTU frame size.

* Add missing AAC parameter setup for AACENC_AUDIOMUXVER
  and AACENC_SIGNALING_MODE

* Add a fix for selecting the bitrate if the sink device reports
  capability with zero bitrate - for such devices we negotiate
  our bitrate. For the actual AAC codec bitrate we still compute
  it based on the MTU and the AAC object type.

Test: Tested with numerous AAC sink devices
Bug: 34953385
Change-Id: I9ca6353b0e1ee107f1242803de4e82d568a3394b

7 years agoGuard btsnooz ringbuffer access from multiple threads
Andre Eisenbach [Thu, 9 Feb 2017 19:44:04 +0000 (11:44 -0800)]
Guard btsnooz ringbuffer access from multiple threads

Since moving to HIDL, the btsnooz packet ringbuffer can be accessed from
two separate threads. Thus it should be guarded from concurrent access
to avoid pointer corruption.

Bug: 35182804
Test: manual
Change-Id: I3e6e1a869887a7ad5d87d8bb09ed78a22b3383ae

7 years agoosi: Remove unused eager_reader code
Myles Watson [Wed, 8 Feb 2017 23:50:16 +0000 (15:50 -0800)]
osi: Remove unused eager_reader code

Test: Builds
Change-Id: Id5c7a8b9ca59ec90c3d2d0d4935f3f5ff287c433

7 years agoMerge "Use CHECK() to verify that HIDL is installed" am: c9f353fa78
Myles Watson [Wed, 8 Feb 2017 14:05:17 +0000 (14:05 +0000)]
Merge "Use CHECK() to verify that HIDL is installed" am: c9f353fa78
am: 54c96032e0

Change-Id: I008018491d3a92a8acb023fd08ddf7bf835a645e

7 years agoMerge "Use CHECK() to verify that HIDL is installed"
Myles Watson [Wed, 8 Feb 2017 14:03:16 +0000 (14:03 +0000)]
Merge "Use CHECK() to verify that HIDL is installed"
am: c9f353fa78

Change-Id: Ie4c283f10611062df08cfc7f6520b3a31e6363cc

7 years agoMerge "Use CHECK() to verify that HIDL is installed"
Treehugger Robot [Wed, 8 Feb 2017 14:00:07 +0000 (14:00 +0000)]
Merge "Use CHECK() to verify that HIDL is installed"

7 years agoMerge "Fix the implementation of htonll()" am: 9c0d0af2b0
Pavlin Radoslavov [Wed, 8 Feb 2017 10:55:34 +0000 (10:55 +0000)]
Merge "Fix the implementation of htonll()" am: 9c0d0af2b0
am: 87b1567d58

Change-Id: I056cb3496c0c572c710e2c60a5ac5a9812d0cdb9

7 years agoMerge "Fix the implementation of htonll()"
Pavlin Radoslavov [Wed, 8 Feb 2017 10:53:34 +0000 (10:53 +0000)]
Merge "Fix the implementation of htonll()"
am: 9c0d0af2b0

Change-Id: I31333bc5c25744a5a438bfc36d6ba347cc761b5f

7 years agoMerge "Fix the implementation of htonll()"
Treehugger Robot [Wed, 8 Feb 2017 10:50:04 +0000 (10:50 +0000)]
Merge "Fix the implementation of htonll()"

7 years agoFix the implementation of htonll()
Pavlin Radoslavov [Tue, 7 Feb 2017 02:48:18 +0000 (18:48 -0800)]
Fix the implementation of htonll()

Prior the fix, all btsnoop entries had same timestamp.

Bug: 35111777
Test: Examine the btsnoop log file with Wireshark
Change-Id: I9e664475ff5b4ffc543d95b90a47c7f80fdc0370

7 years agoMerge "AVRCT CT: uint8_t is used for 2byte field" am: a84ef64eb8
Sanket Agarwal [Tue, 7 Feb 2017 21:56:50 +0000 (21:56 +0000)]
Merge "AVRCT CT: uint8_t is used for 2byte field" am: a84ef64eb8
am: f474d5f2d1

Change-Id: I63d485dde672adbf2ffce916478e8c2875fb9a40

7 years agoHF Client: SCO routing with multiple devices am: ac109dc225
Sanket Agarwal [Tue, 7 Feb 2017 21:56:40 +0000 (21:56 +0000)]
HF Client: SCO routing with multiple devices am: ac109dc225
am: 66d065b665

Change-Id: I19469783e0304d09b1d342a6cb8ca74681f536d2

7 years agoMerge "AVRCT CT: uint8_t is used for 2byte field"
Sanket Agarwal [Tue, 7 Feb 2017 21:54:18 +0000 (21:54 +0000)]
Merge "AVRCT CT: uint8_t is used for 2byte field"
am: a84ef64eb8

Change-Id: I0f7fee007ae4a5b3bd19fa2862e0c22aa7f46cae

7 years agoHF Client: SCO routing with multiple devices
Sanket Agarwal [Tue, 7 Feb 2017 21:54:07 +0000 (21:54 +0000)]
HF Client: SCO routing with multiple devices
am: ac109dc225

Change-Id: Id8893897e60105f11e7b7637a666aaa6cab957ad

7 years agoMerge "AVRCT CT: uint8_t is used for 2byte field"
Sanket Agarwal [Tue, 7 Feb 2017 21:49:00 +0000 (21:49 +0000)]
Merge "AVRCT CT: uint8_t is used for 2byte field"

7 years agoUse CHECK() to verify that HIDL is installed
Myles Watson [Tue, 7 Feb 2017 13:14:06 +0000 (05:14 -0800)]
Use CHECK() to verify that HIDL is installed

Test: build, boot test on angler
Change-Id: Ia64dcceedc233ef494ab0fdce7ee649e74fa45a0

7 years agoHF Client: SCO routing with multiple devices
Sanket Agarwal [Tue, 31 Jan 2017 21:43:58 +0000 (13:43 -0800)]
HF Client: SCO routing with multiple devices

For SCO it makes sense only to have one active connection at a time for
any device since simultaneous SCO calls in a single device is
un-reasonable. This change changes the SCO state machine in following
ways:
a) SCO is not setup automatically whenever AG wants, the client for this
BTA layer will have to call connect_audio to start SCO
b) Also when we disconnect SCO for a device, it does not go into a
listen state. We are making sure that the upper layer caller always has
to call connect to accept a connection

Bug: b/34518638
Test: Manual testing w/ multiple active calls and SCO switching

Change-Id: I6e6c4c6e6ee19e44e3ff14499fb99083102bde5a

7 years agoAVRCT CT: uint8_t is used for 2byte field
Sanket Agarwal [Tue, 7 Feb 2017 01:56:29 +0000 (17:56 -0800)]
AVRCT CT: uint8_t is used for 2byte field

This causes the upper stack to report incorrect entries if the value is
large

Bug: b/34682784
Test: Check with a list > 4 items large and packet size big enough to
exceed uint8_t size

Change-Id: I73233a74378d9c091e33f204780a9492505d99b4

7 years agoMerge changes from topic 'bt5_scan_props' am: 1e73f14e77
Jakub Pawlowski [Tue, 7 Feb 2017 01:35:57 +0000 (01:35 +0000)]
Merge changes from topic 'bt5_scan_props' am: 1e73f14e77
am: de6a7cbd2a

Change-Id: Iee131acc33feb26afa77a70230042eff6beab234