OSDN Git Service

android-x86/system-bt.git
7 years agoHandled invalid MTU Size in L2cap Process Commands am: 633a5bc320 am: 7890228ae8
Ajay Kumar [Thu, 2 Feb 2017 02:03:57 +0000 (02:03 +0000)]
Handled invalid MTU Size in L2cap Process Commands am: 633a5bc320 am: 7890228ae8
am: 4b23210286

Change-Id: Ie97a5a835e5f493416454747bd76b3d8b3840ded

7 years agoHandled invalid MTU Size in L2cap Process Commands am: 633a5bc320
Ajay Kumar [Thu, 2 Feb 2017 01:59:34 +0000 (01:59 +0000)]
Handled invalid MTU Size in L2cap Process Commands am: 633a5bc320
am: 7890228ae8

Change-Id: Ib65285ffcffb2247c54d866154c40592038f2718

7 years agoHandled invalid MTU Size in L2cap Process Commands
Ajay Kumar [Thu, 2 Feb 2017 01:57:05 +0000 (01:57 +0000)]
Handled invalid MTU Size in L2cap Process Commands
am: 633a5bc320

Change-Id: I8d6b1d76cb8ff644fbb9cbfff987e3f80bb04522

7 years agoHandled invalid MTU Size in L2cap Process Commands
Ajay Kumar [Wed, 12 Mar 2014 13:59:27 +0000 (19:29 +0530)]
Handled invalid MTU Size in L2cap Process Commands

Use case: Execute the L2CAP test suite on Codenomicon tool

(1)From tool Codenomicon Defensics 11 menu Utilities > Bluetooth Scan,
paired Bluetooth between pc and phone.
(2)From Defensics 11 Settings ,choose paired phone Bluetooth to be
Target Bluetooth device address in Basic configuration.
(3)Run the test case " Security - l2cap ".
(4)When run to the number 28, 29 test case,check the phone. BT turn
off and turn on

Failure: BT crash observed due to invalid MTU packets from test tool

Root cause: L2CAP is not validating packets in L2CAP Process Commands

Fix: Fixed by sending reject CMD for invalid commands from tool

Test: code compilation.

Change-Id: I8c503ab77d8fca3728a84c3457d8115e31ee3a13

7 years agoAdd memory allocation statistics to the Bluetooth dumpsys output am: 0b4f3f7efb am...
Pavlin Radoslavov [Wed, 1 Feb 2017 17:23:02 +0000 (17:23 +0000)]
Add memory allocation statistics to the Bluetooth dumpsys output am: 0b4f3f7efb am: 86b25af22d
am: 7f090b95a7

Change-Id: Ic703180d91560b7abc9161164a0f16ed5c6a8fcf

7 years agoAdd memory allocation statistics to the Bluetooth dumpsys output am: 0b4f3f7efb
Pavlin Radoslavov [Wed, 1 Feb 2017 17:21:00 +0000 (17:21 +0000)]
Add memory allocation statistics to the Bluetooth dumpsys output am: 0b4f3f7efb
am: 86b25af22d

Change-Id: Iac2495dd6a87518e8b745cc5710580253cfb8d6c

7 years agoAdd memory allocation statistics to the Bluetooth dumpsys output
Pavlin Radoslavov [Wed, 1 Feb 2017 17:18:30 +0000 (17:18 +0000)]
Add memory allocation statistics to the Bluetooth dumpsys output
am: 0b4f3f7efb

Change-Id: I6a06bb516ba11327e32c5ede504a92ae79ab20ea

7 years agoAdd memory allocation statistics to the Bluetooth dumpsys output
Pavlin Radoslavov [Wed, 1 Feb 2017 11:55:33 +0000 (03:55 -0800)]
Add memory allocation statistics to the Bluetooth dumpsys output

The following memory allocation statistics are added to
the "dumpsys bluetooth_manager" output.
Those are tracking the allocations that are using the OSI malloc mechanism:
osi_strdup() / osi_strndup() / osi_malloc() / osi_calloc() / osi_free()

Bluetooth Memory Allocation Statistics:
  Total allocated/free/used counts : 4063 / 3323 / 740
  Total allocated/free/used octets : 922460 / 607941 / 314519

Test: Running "adb shell dumpsys bluetooth_manager"
Change-Id: Ibe1d28ec3a2acfd87cfaa10e5902ef3b596e64a8

7 years agoUpdate the A2DP Codec Config API am: 494e53e904 am: 0be63749e6
Pavlin Radoslavov [Tue, 31 Jan 2017 19:18:53 +0000 (19:18 +0000)]
Update the A2DP Codec Config API am: 494e53e904 am: 0be63749e6
am: d13f2b42d1

Change-Id: I305eab645e0ef028222998e6b5e0c1f179546c57

7 years agoUpdate the A2DP Codec Config API am: 494e53e904
Pavlin Radoslavov [Tue, 31 Jan 2017 19:13:24 +0000 (19:13 +0000)]
Update the A2DP Codec Config API am: 494e53e904
am: 0be63749e6

Change-Id: I4497045f9d9202756a2a26228a0f05c1c4aa1f0c

7 years agoUpdate the A2DP Codec Config API
Pavlin Radoslavov [Tue, 31 Jan 2017 19:08:15 +0000 (19:08 +0000)]
Update the A2DP Codec Config API
am: 494e53e904

Change-Id: I02831600027b777d41dc5c1b67ac844fa03e9118

7 years agoUpdate the A2DP Codec Config API
Pavlin Radoslavov [Thu, 26 Jan 2017 01:00:23 +0000 (17:00 -0800)]
Update the A2DP Codec Config API

Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
 1. The current codec config
 2. The list of codecs containing the local codecs capabilities
 3. The list of codecs containing the selectable codecs capabilities.
    This list is the intersection of the local codecs capabilities
    and the capabilities of the paired device.

Also, updated the codec backend to accomodate the above changes:
 * Update all selectable codecs inside bta_av_co_audio_set_codec()
 * Changed getCodecConfigAndCapabilities() to return current codec
   config, local codecs capabilities, and selectable codecs capabilities.
 * Updated each codec to compute and store a copy of the selectable
   capabilities, and the local capabilities.
 * Updated tA2DP_SBC_CIE to include new field bits_per_sample
   (for consistency with the rest of the codecs).
 * Replaced usage of codec_priority of 0 with BTAV_A2DP_CODEC_PRIORITY_DEFAULT
 * If there is user codec (re)config call, we always send an upcall
   to inform the Java layer about the most recent codec info.
   Thus, the caller would always know whether the request succeeded or failed.

Test: A2DP streaming with headsets and switching the codecs
Change-Id: Ie7a5cd5c2ab01bb8676032be05bc2ad03baa1e3f

7 years agoMerge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into master. am: 665bcf8f2d...
Stephen Li [Fri, 27 Jan 2017 07:41:27 +0000 (07:41 +0000)]
Merge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into  am: 665bcf8f2d am: c28c4325d2
am: a5ec60c8ea

Change-Id: If75cb421471c37eaf3da732832ec5eaf8ee032ec

7 years agoMerge "Remove HC_BUFFER_HDR_T" am: a6f6077be8 am: a993bc5266
Andre Eisenbach [Fri, 27 Jan 2017 07:41:13 +0000 (07:41 +0000)]
Merge "Remove HC_BUFFER_HDR_T" am: a6f6077be8 am: a993bc5266
am: c236b9d2d9

Change-Id: Ie755d5feaeb74ccb796640b20d1c5c06ff2f3812

7 years agoMerge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into master. am: 665bcf8f2d
Stephen Li [Fri, 27 Jan 2017 07:37:43 +0000 (07:37 +0000)]
Merge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into  am: 665bcf8f2d
am: c28c4325d2

Change-Id: Ib4b641b82598b01ce6f6706929b4e95a120ad359

7 years agoMerge "Remove HC_BUFFER_HDR_T" am: a6f6077be8
Andre Eisenbach [Fri, 27 Jan 2017 07:34:22 +0000 (07:34 +0000)]
Merge "Remove HC_BUFFER_HDR_T" am: a6f6077be8
am: a993bc5266

Change-Id: Id395ad6449a22f6fad413aec292dfeff86bbcb14

7 years agoMerge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into master.
Stephen Li [Fri, 27 Jan 2017 01:22:43 +0000 (01:22 +0000)]
Merge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into 
am: 665bcf8f2d

Change-Id: I3a3fc2d0cc9f6681178a5877b127ad55f98be9bc

7 years agoMerge "Remove HC_BUFFER_HDR_T"
Andre Eisenbach [Fri, 27 Jan 2017 01:22:32 +0000 (01:22 +0000)]
Merge "Remove HC_BUFFER_HDR_T"
am: a6f6077be8

Change-Id: I72c589c900c83b6adcd229248dc5b8590a73b64b

7 years agoMerge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into master.
Stephen Li [Thu, 26 Jan 2017 23:45:27 +0000 (15:45 -0800)]
Merge commit 'ca6d7dcbd49356338eaaa88de87885ecaf218c4d' into 

This is because patchset 1 of change 328081 got merged in to the branch
and not patchset 2, despite what gerrit UI says. This is a known error
and is being worked on.

Change-Id: If4f6f3d705e93f03d120c6441e16e9b0afc3d9ca

7 years agoMerge "Remove HC_BUFFER_HDR_T"
Treehugger Robot [Thu, 26 Jan 2017 23:22:12 +0000 (23:22 +0000)]
Merge "Remove HC_BUFFER_HDR_T"

7 years agoRemove HC_BUFFER_HDR_T
Andre Eisenbach [Wed, 25 Jan 2017 17:26:41 +0000 (09:26 -0800)]
Remove HC_BUFFER_HDR_T

Test: compiles
Change-Id: Ia5bf3395bd5a18a27168f05a0a2239a37ddb2c2c

7 years agoIntegration of the AAC codec for A2DP source am: d5f4960b42 am: 2c66cfabaf
Pavlin Radoslavov [Thu, 26 Jan 2017 19:31:26 +0000 (19:31 +0000)]
Integration of the AAC codec for A2DP source am: d5f4960b42 am: 2c66cfabaf
am: 367d77d29d

Change-Id: I659dd884556f05164ebec6198c3db0d38971c37a

7 years agoIntegration of the AAC codec for A2DP source am: d5f4960b42
Pavlin Radoslavov [Thu, 26 Jan 2017 19:25:53 +0000 (19:25 +0000)]
Integration of the AAC codec for A2DP source am: d5f4960b42
am: 2c66cfabaf

Change-Id: Ib6e37d4dace1d3db0b6b170de7b3b2fcc076aef4

7 years agoIntegration of the AAC codec for A2DP source
Pavlin Radoslavov [Thu, 26 Jan 2017 19:20:31 +0000 (19:20 +0000)]
Integration of the AAC codec for A2DP source
am: d5f4960b42

Change-Id: I75433922a48fab734ea5d0ee01c93d3a44cde8d8

7 years agoIntegration of the AAC codec for A2DP source
Pavlin Radoslavov [Wed, 4 Jan 2017 00:53:18 +0000 (16:53 -0800)]
Integration of the AAC codec for A2DP source

Also:
 - Implemented data fragmentation inside bta_av_data_path()
   that is RTP compatible.
 - Do not use the codec_type when composing the RTP payload type
   per RFC 3016, Section 4.2. That value doesn't have actual meaning
   in the context of the Bluetooth supported codecs, and is ambiguous:
   all vendor codecs map to the same value 0xFF.
 - Updated support function A2DP_BitsSet() so it works for
   up to 64-bit integers.
 - Updated a log message inside l2c_data_write() to print
   packet length and peer MTU on error.

Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: I1b530f1c5c495b8231fd68bed788d4567096683d

7 years agoMerge "Update UUIDs immediately on NVRAM" am: 87cf1322fc am: 6b46114f5a
Srinu Jella [Wed, 25 Jan 2017 20:11:22 +0000 (20:11 +0000)]
Merge "Update UUIDs immediately on NVRAM" am: 87cf1322fc am: 6b46114f5a
am: c4c84d5445

Change-Id: I43a18b76ed28e4713cdffbf15d7c59090c83655c

7 years agoMerge "Update UUIDs immediately on NVRAM" am: 87cf1322fc
Srinu Jella [Wed, 25 Jan 2017 20:06:46 +0000 (20:06 +0000)]
Merge "Update UUIDs immediately on NVRAM" am: 87cf1322fc
am: 6b46114f5a

Change-Id: Ie8b3c383f711e3a402c531a9a98ee8eb852c6c91

7 years agoMerge "Update UUIDs immediately on NVRAM"
Srinu Jella [Wed, 25 Jan 2017 20:02:15 +0000 (20:02 +0000)]
Merge "Update UUIDs immediately on NVRAM"
am: 87cf1322fc

Change-Id: I7d302edf5c42ceb90f3e1692e243410063218636

7 years agoMerge "Update UUIDs immediately on NVRAM"
Treehugger Robot [Wed, 25 Jan 2017 19:55:59 +0000 (19:55 +0000)]
Merge "Update UUIDs immediately on NVRAM"

7 years agoMerge "Corrected default value assignments in Bluetooth A2DP Metrics" am: df1668926d...
Jack He [Wed, 25 Jan 2017 19:35:42 +0000 (19:35 +0000)]
Merge "Corrected default value assignments in Bluetooth A2DP Metrics" am: df1668926d am: f85d231647
am: a245e2dd05

Change-Id: Iaccabb4d0ec72903335d27b8d593e3174f7e623d

7 years agoMerge "Corrected default value assignments in Bluetooth A2DP Metrics" am: df1668926d
Jack He [Wed, 25 Jan 2017 19:33:12 +0000 (19:33 +0000)]
Merge "Corrected default value assignments in Bluetooth A2DP Metrics" am: df1668926d
am: f85d231647

Change-Id: Ie42f410cc3c1df184f20b78d84f0a634c374facb

7 years agoMerge "Corrected default value assignments in Bluetooth A2DP Metrics"
Jack He [Wed, 25 Jan 2017 19:30:42 +0000 (19:30 +0000)]
Merge "Corrected default value assignments in Bluetooth A2DP Metrics"
am: df1668926d

Change-Id: Ibeca5167e014e7ef51da639bcc12d3b2d89ec9b9

7 years agoMerge "Corrected default value assignments in Bluetooth A2DP Metrics"
Treehugger Robot [Wed, 25 Jan 2017 19:28:02 +0000 (19:28 +0000)]
Merge "Corrected default value assignments in Bluetooth A2DP Metrics"

7 years agoUpdate UUIDs immediately on NVRAM
Srinu Jella [Mon, 21 Nov 2016 12:56:58 +0000 (18:26 +0530)]
Update UUIDs immediately on NVRAM

As the BTIF config updation have delay in writing items
to the NVRAM, some times there is a chance of not updating
incase of battery removal happens before the actual write onto
NVRAM.

As SDP UUIDs is important data to store, it will update
immediately onto NVRAM.

Test: manual

Change-Id: I6637dc326f3a53211a5bbf988a2dca1020203128

7 years agoRemove HC_BUFFER_HDR_T
Andre Eisenbach [Wed, 25 Jan 2017 17:26:41 +0000 (09:26 -0800)]
Remove HC_BUFFER_HDR_T

Test: compiles
Change-Id: Ia5bf3395bd5a18a27168f05a0a2239a37ddb2c2c

7 years agoHID: Fix forced disconnection flow. am: 367373ba8b am: d6cff48023
Ivan Podogov [Wed, 25 Jan 2017 00:16:24 +0000 (00:16 +0000)]
HID: Fix forced disconnection flow. am: 367373ba8b am: d6cff48023
am: a9f6ab4db2

Change-Id: I2e7194d2a842d74c089e69caf4407872846d64a6

7 years agoHID: Fix forced disconnection flow. am: 367373ba8b
Ivan Podogov [Wed, 25 Jan 2017 00:14:24 +0000 (00:14 +0000)]
HID: Fix forced disconnection flow. am: 367373ba8b
am: d6cff48023

Change-Id: I9171655b4cfe05e4395d2381461316bd05824a1e

7 years agoHID: Fix forced disconnection flow.
Ivan Podogov [Wed, 25 Jan 2017 00:12:23 +0000 (00:12 +0000)]
HID: Fix forced disconnection flow.
am: 367373ba8b

Change-Id: Ia72cfb5979735bdb2b091291719ac895331bba7e

7 years agoHID: Fix forced disconnection flow.
Ivan Podogov [Thu, 19 Jan 2017 17:19:37 +0000 (17:19 +0000)]
HID: Fix forced disconnection flow.

In some cases, we end up in a state where we can neither
connect nor forcefully end connection, and will require disabling
the Bluetooth adapter to fix this state.

When a device is taking too long to connect (or out of range),
the user may want to cancel the connection by calling disconnect
method, which will be ignored in any state other than
BTA_HD_CONN_ST. It is a lot better to immediately cease the
connection process at this point, so:
- BTA_HD_API_DISCONNECT_EVT is now not ignored in BTA_HD_IDLE_ST;
- bta_hd_disconnect_act now reports a correct MAC address during
    disconnection (it used to send 00:00:00:00:00:00 before);
- HidDevDisconnect now allows to forcefully end the connection,
    and does it in exactly the same way we handle the errors.

When L2CAP connection fails, both hidd_l2cif_config_ind and
hidd_l2cif_config_cfm set conn_state to HID_CONN_STATE_UNUSED,
which is immediately overwritten by the hidd_conn_disconnect call
(it will set conn_state to HID_CONN_STATE_DISCONNECTING, because
ctrl_cid != 0 in both cases), thus making any subsequent calls to
connect failing with "already connecting" error. More than that,
all functions send the HID_DHOST_EVT_CLOSE event when failing,
which is, again, ignored in the BTA_HD_IDLE_ST state. So:
- BTA_HD_INT_CLOSE_EVT is now not ignored in BTA_HD_IDLE_ST;
- conn_state is set to HID_CONN_STATE_UNUSED after the call to
    hidd_conn_disconnect, but before sending the close event.

Test: Build, run, connect/disconnect multiple times.
Change-Id: I85bb03f760bb9a6fd4c1b944d515232c1be12300

7 years agoCorrected default value assignments in Bluetooth A2DP Metrics
Jack He [Fri, 20 Jan 2017 19:17:44 +0000 (11:17 -0800)]
Corrected default value assignments in Bluetooth A2DP Metrics

* In certain cases btif_a2dp_source_stop_audio_req() could be called before
  btif_a2dp_source_start_audio_req() is called, resulting in session_start_us
  to be 0. In this case, audio_duration_ms = time_get_os_boottime_us() - 0
  will be a very large number that is not the actual audio duration. This
  CL marks audio_duration_ms as -1 in the above situation so that we can
  differentiate between valid and invalid audio durations
* Set default timer and counter values to 0 when
  tx_queue_dequeue_stats.total_updates > 1
* Move update_scheduling_stats for tx_queue_enqueue_stats to
  btif_a2dp_source_audio_handle_timer as we intend to capture the time
  intervals for enqueue scheduling instead of time intervals between
  frame enqueue (i.e. one scheduling event can enqueue multiple frames)
* Use tx_queue_enqueue_stats for metrics instead of *dequeue* since only
  enqueue is triggered by timer event

Bug: 33694310
Test: Code compilation, BtFunhausMetricsTest
Change-Id: I10984920afd4d77f07a5ac75736f8dcd69b13af8
(cherry picked from commit 5a9925784a4a34811ae29608b67dee4a580c226b)

7 years agoCorrected default value assignments in Bluetooth A2DP Metrics
Jack He [Tue, 24 Jan 2017 03:08:50 +0000 (03:08 +0000)]
Corrected default value assignments in Bluetooth A2DP Metrics
am: 5a9925784a  -s ours

Change-Id: I892297073139b248d1c8a4c5d2e3c5228c4f1f8e

7 years agoAdd advertising handle zero quirk am: 6d75adcc03 am: 11438472ac
Jakub Pawlowski [Tue, 24 Jan 2017 00:42:19 +0000 (00:42 +0000)]
Add advertising handle zero quirk am: 6d75adcc03 am: 11438472ac
am: a621004ddb

Change-Id: I93eb9ace24d661a91c72ef608218e698dda93eb6

7 years agoCorrected default value assignments in Bluetooth A2DP Metrics
Jack He [Fri, 20 Jan 2017 19:17:44 +0000 (11:17 -0800)]
Corrected default value assignments in Bluetooth A2DP Metrics

* In certain cases btif_media_task_stop_aa_req() could be called before
  btif_media_task_start_aa_req() is called, resulting in session_start_us
  to be 0. In this case, audio_duration_ms = time_now_us() - 0 will be a
  very large number that is not the actual audio duration.This CL marks
  audio_duration_ms as -1 in the above situation so that we can
  differentiate between valid and invalid audio durations
* Set default timer and counter values to 0 when
  tx_queue_dequeue_stats.total_updates > 1
* Move update_scheduling_stats for tx_queue_enqueue_stats to
  btif_media_task_aa_handle_timer as we intend to capture the time
  intervals for enqueue scheduling instead of time intervals between
  frame enqueue (i.e. one scheduling event can enqueue multiple frames)
* Use tx_queue_enqueue_stats instead of *dequeue* since only enqueue is
  triggered by timer event

Bug: 33694310
Test: Code compilation, BtFunhausMetricsTest
Change-Id: I10984920afd4d77f07a5ac75736f8dcd69b13af8

7 years agoAdd advertising handle zero quirk am: 6d75adcc03
Jakub Pawlowski [Mon, 23 Jan 2017 23:45:57 +0000 (23:45 +0000)]
Add advertising handle zero quirk am: 6d75adcc03
am: 11438472ac

Change-Id: Ie2266ac54b28fd507cff9026b45a0e6a1b17aa5e

7 years agoAdd advertising handle zero quirk
Jakub Pawlowski [Mon, 23 Jan 2017 23:43:56 +0000 (23:43 +0000)]
Add advertising handle zero quirk
am: 6d75adcc03

Change-Id: I520cd3d1aff332d9eb0ccce13f36dc0aceb2f25e

7 years agoAdd advertising handle zero quirk
Jakub Pawlowski [Mon, 23 Jan 2017 22:03:19 +0000 (14:03 -0800)]
Add advertising handle zero quirk

Some controllers are strict about VSC handle mapping, and don't allow
using zero value.

Test: manual test
Change-Id: Ia2df17af16e0e4da375d6e7d5b5f882ced508ce9

7 years agoFix the GATT server and HOGP disconnect am: c176ff364e am: f83cdcb7fc
IHLHO KIM [Mon, 23 Jan 2017 19:04:57 +0000 (19:04 +0000)]
Fix the GATT server and HOGP disconnect am: c176ff364e am: f83cdcb7fc
am: f9b12ed798

Change-Id: I8eef83c2107b502623e2f1c63fd2f5d076ed7934

7 years agoFix the GATT server and HOGP disconnect am: c176ff364e
IHLHO KIM [Mon, 23 Jan 2017 19:00:55 +0000 (19:00 +0000)]
Fix the GATT server and HOGP disconnect am: c176ff364e
am: f83cdcb7fc

Change-Id: If46dcdd664c3a433b0c16acac955acb2c79ffa2a

7 years agoFix the GATT server and HOGP disconnect
IHLHO KIM [Mon, 23 Jan 2017 18:56:56 +0000 (18:56 +0000)]
Fix the GATT server and HOGP disconnect
am: c176ff364e

Change-Id: I13a676f6d9beac6f5cf07960c8b9cfe4fc2a7a68

7 years agoFix the GATT server and HOGP disconnect
IHLHO KIM [Fri, 13 Jan 2017 06:27:38 +0000 (06:27 +0000)]
Fix the GATT server and HOGP disconnect

GATT server disconnect and HOGP disconnect are not working after the
following commit: a62adcab30929566b435891611232566bd69204a.

‘BTA_GATTS_CancelOpen’ makes â€˜gatt_update_app_hold_link_status’
return FALSE value. As a result, â€˜BTA_GATTS_Close’ cannot disconnect
the link. The sequence has to be changed like GATT client.

And the above mentioned fix removed â€˜found’ checking routine in
‘gatt_update_app_hold_link_status’.

It makes two app hold links with same gatt_if when HOGP is connected and
background connection is added. But HOGP disconnect removes only one held
link. So HOGP is never disconnected.

The â€˜found’ checking routine has to be rolled back.

Test: manual
Change-Id: Ibea825b5cc844195f0cf4a30cbcca831880c9088

7 years agoFix advertising timeout behaviour. am: 657baed5df am: abf317c0a1
Jakub Pawlowski [Sat, 21 Jan 2017 09:07:38 +0000 (09:07 +0000)]
Fix advertising timeout behaviour. am: 657baed5df am: abf317c0a1
am: 04ea6908de

Change-Id: I7c5da1082f78855eb1a60340ba624bb6a3ff73e7

7 years agoFix advertising timeout behaviour. am: 657baed5df
Jakub Pawlowski [Sat, 21 Jan 2017 09:03:38 +0000 (09:03 +0000)]
Fix advertising timeout behaviour. am: 657baed5df
am: abf317c0a1

Change-Id: I96c1977d4fa186c513a5c55215d59f70d5b21d96

7 years agoFix advertising timeout behaviour.
Jakub Pawlowski [Sat, 21 Jan 2017 08:59:37 +0000 (08:59 +0000)]
Fix advertising timeout behaviour.
am: 657baed5df

Change-Id: I026f8798a67438e200f0a1b9c078776d7065e419

7 years agoFix advertising timeout behaviour.
Jakub Pawlowski [Fri, 20 Jan 2017 13:33:38 +0000 (05:33 -0800)]
Fix advertising timeout behaviour.

When advertising is enabled with timeout, enable callback was not
called. Also we were not scheduling the disable operation after the
timeout passes. This patch fixes that. It also make sure that the
timeout callback is called on proper thread.

Bug: 34440704
Test: sl4a ConcurrentBleAdvertising:test_timeout
Change-Id: I233c2692c690f55ef6243325640e48b37818c9d5

7 years agoMerge "Set alarm's queue to NULL on alarm expired" am: 1ad559cf00 am: 0ff83d9a87
Kamal Negi [Fri, 20 Jan 2017 23:48:00 +0000 (23:48 +0000)]
Merge "Set alarm's queue to NULL on alarm expired" am: 1ad559cf00 am: 0ff83d9a87
am: 6ac5c77c17

Change-Id: Id23e3f8e365db13dfe0ea13d08876f3d71f74d75

7 years agoMerge "Set alarm's queue to NULL on alarm expired" am: 1ad559cf00
Kamal Negi [Fri, 20 Jan 2017 23:43:59 +0000 (23:43 +0000)]
Merge "Set alarm's queue to NULL on alarm expired" am: 1ad559cf00
am: 0ff83d9a87

Change-Id: I753305fafe1b675eb5f48ccd701165c2c3118443

7 years agoMerge "Set alarm's queue to NULL on alarm expired"
Kamal Negi [Fri, 20 Jan 2017 23:40:29 +0000 (23:40 +0000)]
Merge "Set alarm's queue to NULL on alarm expired"
am: 1ad559cf00

Change-Id: Icfe0576b893be813645375f3da234ee7a3fa4455

7 years agoMerge "Synchronize hl data operations" am: 0d8bb2b099 am: cac856b821
Srinu Jella [Fri, 20 Jan 2017 23:36:59 +0000 (23:36 +0000)]
Merge "Synchronize hl data operations" am: 0d8bb2b099 am: cac856b821
am: 33d5f5f44b

Change-Id: I15a204d60a315453f3c468e8c7ebbacadb080456

7 years agoMerge "Set alarm's queue to NULL on alarm expired"
Treehugger Robot [Fri, 20 Jan 2017 23:36:39 +0000 (23:36 +0000)]
Merge "Set alarm's queue to NULL on alarm expired"

7 years agoMerge "Synchronize hl data operations" am: 0d8bb2b099
Srinu Jella [Fri, 20 Jan 2017 23:33:30 +0000 (23:33 +0000)]
Merge "Synchronize hl data operations" am: 0d8bb2b099
am: cac856b821

Change-Id: I48c2c0d1431bf5a8ab1a77d887460d3e3a52a650

7 years agoMerge "Synchronize hl data operations"
Srinu Jella [Fri, 20 Jan 2017 23:29:57 +0000 (23:29 +0000)]
Merge "Synchronize hl data operations"
am: 0d8bb2b099

Change-Id: I65ef2e27332de47e921f15aaca76668cc75f9567

7 years agoMerge "Synchronize hl data operations"
Treehugger Robot [Fri, 20 Jan 2017 23:25:44 +0000 (23:25 +0000)]
Merge "Synchronize hl data operations"

7 years agoUpdate error check for LE read remote feature event am: 86d5b5658c am: 623a6d4f63
Nagarjuna Kristam [Fri, 20 Jan 2017 21:47:21 +0000 (21:47 +0000)]
Update error check for LE read remote feature event am: 86d5b5658c am: 623a6d4f63
am: 3b49defdc7

Change-Id: Ie70baff2dc267b91ac5d38c1a0b548333ec7cdc5

7 years agoUpdate error check for LE read remote feature event am: 86d5b5658c
Nagarjuna Kristam [Fri, 20 Jan 2017 21:44:21 +0000 (21:44 +0000)]
Update error check for LE read remote feature event am: 86d5b5658c
am: 623a6d4f63

Change-Id: I209d901733690f8ace8855865370738fd304e9a9

7 years agoUpdate error check for LE read remote feature event
Nagarjuna Kristam [Fri, 20 Jan 2017 21:41:23 +0000 (21:41 +0000)]
Update error check for LE read remote feature event
am: 86d5b5658c

Change-Id: Icdb02974837695995dacb1598772d4b46af66d9b

7 years agoUpdate error check for LE read remote feature event
Nagarjuna Kristam [Tue, 13 Dec 2016 09:00:45 +0000 (14:30 +0530)]
Update error check for LE read remote feature event

When a BLE remote read remote feature complete event is received
initial commands flow is proceeding if error code is not connection
failed to establish (0x3E). Instead, the flow should fail on any
error.

Test: Re-connection stress tests with LE device
Change-Id: I4ab80b6601f5f852fcf8da2911807438584fd3f4

7 years agoBluetooth: Handle get RSSI timeout gracefully am: b0014dae41 am: 8fe142c111
Satish Kodishala [Fri, 20 Jan 2017 21:30:29 +0000 (21:30 +0000)]
Bluetooth: Handle get RSSI timeout gracefully am: b0014dae41 am: 8fe142c111
am: 934de6fcda

Change-Id: I2ef0fbe66b98d21433cd9e032271458d8782ccb6

7 years agoBTA HF CLIENT: Unset initial SCO value am: 882760d186 am: 7aec0a91c5
Sanket Agarwal [Fri, 20 Jan 2017 21:30:18 +0000 (21:30 +0000)]
BTA HF CLIENT: Unset initial SCO value am: 882760d186 am: 7aec0a91c5
am: 48952ac133

Change-Id: Idc377938c9619c1a46eb07c54c907245e7872b2a

7 years agoSet alarm's queue to NULL on alarm expired
Kamal Negi [Mon, 19 Sep 2016 08:46:56 +0000 (14:16 +0530)]
Set alarm's queue to NULL on alarm expired

Use Case: Repeated BT ON/OFF

Failure: ANR due to race condition between random advertisement
address generation completion(adv_raddr_timer) and BT shutdown.

Steps: SNS Stress testing.

Root Cause: Race condition happens between random advertisement
address generation completion(adv_raddr_timer) and BT shutdown.

Fix:  For non-periodic alarms, set alarm's queue to NULL once alarm
expired.

Test: mm -j8

Change-Id: Idf8e2bebdc2ca7621aef06dd5f2075ef2c5fa08c

7 years agoBluetooth: Handle get RSSI timeout gracefully am: b0014dae41
Satish Kodishala [Fri, 20 Jan 2017 21:26:48 +0000 (21:26 +0000)]
Bluetooth: Handle get RSSI timeout gracefully am: b0014dae41
am: 8fe142c111

Change-Id: Ib667ace75390ab1c969aac216e3babb58ea82dfa

7 years agoBluetooth: Handle get RSSI timeout gracefully
Satish Kodishala [Fri, 20 Jan 2017 21:25:49 +0000 (21:25 +0000)]
Bluetooth: Handle get RSSI timeout gracefully
am: b0014dae41

Change-Id: I55f9d891c58b82e12073fe57d1d19bdf64f6019d

7 years agoBTA HF CLIENT: Unset initial SCO value am: 882760d186
Sanket Agarwal [Fri, 20 Jan 2017 21:25:49 +0000 (21:25 +0000)]
BTA HF CLIENT: Unset initial SCO value am: 882760d186
am: 7aec0a91c5

Change-Id: I238b52168be022d5112b70bcff06d2a5381a7c19

7 years agoBTA HF CLIENT: Unset initial SCO value
Sanket Agarwal [Fri, 20 Jan 2017 21:21:48 +0000 (21:21 +0000)]
BTA HF CLIENT: Unset initial SCO value
am: 882760d186

Change-Id: I1342f805da9d37e542e137bad9eda54bab8287c2

7 years agoSynchronize hl data operations
Srinu Jella [Wed, 30 Nov 2016 09:55:12 +0000 (15:25 +0530)]
Synchronize hl data operations

Use Case: BT crash seen while transferring data
using HDP APP to remote health device.

Steps:
1. Pair with HDP device
2. Run HDP APP and transfer data to Remote HDP device.

Failure: BT automatically resets and recovers.

Root Cause: Synchronize BITF HL free buffer as simultaneously
free buffer from BTIF and BTU thread lead to sigabort.

Fix: Validate Tx packet before memcpy as it can be free
from different thread.

Test: mm -j8
Change-Id: I566f62ce02c8e95c9f4b8d7155132e4434657f66

7 years agoBluetooth: Handle get RSSI timeout gracefully
Satish Kodishala [Tue, 20 Dec 2016 05:31:07 +0000 (11:01 +0530)]
Bluetooth: Handle get RSSI timeout gracefully

Usecase:
1. Turn ON BT
2. Pair and connect with Headset
3. Play Music over A2DP
4. Make GetRssi timeout
5. Bt app crashes

Failure:
BT app crashes.

Rootcause:
Calling callback with NULL and in callback handling NULL check with assert.

Fix:
Call the callback with error instead of NULL.

Change-Id: I20a9e504a513697945cd76d218ec12a0ef1e3330

7 years agoBTA HF CLIENT: Unset initial SCO value
Sanket Agarwal [Fri, 20 Jan 2017 19:06:41 +0000 (11:06 -0800)]
BTA HF CLIENT: Unset initial SCO value

Initialize the block with invalid SCO state so that while allocating the
if condition does not ignore the block. This was causing the stack to
not initiate a SCO connection to the remote (AG role)

Bug: b/33555377
Test: Check for SCO initialied on audio call
Change-Id: I3f5619c69288483bfa45c2a1adcf22008e353841

7 years agoFix A2DP Metrics Logging Capacity
Jack He [Fri, 20 Jan 2017 04:23:23 +0000 (04:23 +0000)]
Fix A2DP Metrics Logging Capacity
am: 7ab4b59672  -s ours

Change-Id: I5e9736a2ba073e4800d6ebf68488b0109cb0a93d

7 years agoFix A2DP Metrics Logging Capacity am: a3f831cc74 am: 1cac42b5da
Jack He [Fri, 20 Jan 2017 04:18:49 +0000 (04:18 +0000)]
Fix A2DP Metrics Logging Capacity am: a3f831cc74 am: 1cac42b5da
am: 33c97583c3

Change-Id: I36ab0847299a9c7d8684a292cdfc3680526c23c3

7 years agoFix A2DP Metrics Logging Capacity am: a3f831cc74
Jack He [Fri, 20 Jan 2017 04:02:16 +0000 (04:02 +0000)]
Fix A2DP Metrics Logging Capacity am: a3f831cc74
am: 1cac42b5da

Change-Id: I85fd2f52849365593106e7f45bdcdb9c493d2f0a

7 years agoFix A2DP Metrics Logging Capacity
Jack He [Fri, 20 Jan 2017 03:53:20 +0000 (03:53 +0000)]
Fix A2DP Metrics Logging Capacity
am: a3f831cc74

Change-Id: I6a790aae682f6b8282de219a286f82bdca4503b5

7 years agoFix A2DP Metrics Logging Capacity
Jack He [Tue, 17 Jan 2017 23:41:30 +0000 (15:41 -0800)]
Fix A2DP Metrics Logging Capacity

* Set the maximum number of wake events logged to 1000
* Stop logging wake log name as it takes too much memory
* Add counters for each of the repeated values in BluetoothLog so that
  the true number of events can be determined while oldest event get
  dropped
* Log Bluetooth session disconnect reasons using enum instead of string
  in order to save memory usage
* Apply other branch changes to bluetooth.proto on system/bt

Bug: 33694310
Test: Code compilation and unit tests
Change-Id: I2cc6f9304725938b63b211d615eb1941eac60edf
(cherry picked from commit 7ab4b59672013eddcb706e288962ab7309a75628)

7 years agotest_vendor: Remove extra byte in LE Features am: a72fc53164 am: e13ce6b773
Myles Watson [Thu, 19 Jan 2017 23:31:47 +0000 (23:31 +0000)]
test_vendor: Remove extra byte in LE Features am: a72fc53164 am: e13ce6b773
am: 2a0b4a708b

Change-Id: I2b135ed8033f1de459ad2f6c988bbcc48c9ff7ea

7 years agotest_vendor: Remove extra byte in LE Features am: a72fc53164
Myles Watson [Thu, 19 Jan 2017 23:25:43 +0000 (23:25 +0000)]
test_vendor: Remove extra byte in LE Features am: a72fc53164
am: e13ce6b773

Change-Id: Ibf2b67f0165db5ff470bbadc7979931caff5b713

7 years agotest_vendor: Remove extra byte in LE Features
Myles Watson [Thu, 19 Jan 2017 23:23:09 +0000 (23:23 +0000)]
test_vendor: Remove extra byte in LE Features
am: a72fc53164

Change-Id: If703d5f52b0ee55338f0f3c24c5c6cad113fe108

7 years agotest_vendor: Remove extra byte in LE Features
Myles Watson [Thu, 19 Jan 2017 21:13:55 +0000 (13:13 -0800)]
test_vendor: Remove extra byte in LE Features

Bug: 34357009
Test: push test-vendor lib as libbt-vendor.so, Bluetooth starts
Change-Id: Id3a5f85f6b3da5a723dba04527db8b66de0e84a8

7 years agoFix bad UUID comparison when adding GATT service am: 33f424d493 am: bd6197aae4
Jakub Pawlowski [Thu, 19 Jan 2017 14:56:19 +0000 (14:56 +0000)]
Fix bad UUID comparison when adding GATT service am: 33f424d493 am: bd6197aae4
am: 4a19441605

Change-Id: I96f6dde137c1eb6b783c9a7e90aa82d7cf049d20

7 years agoFix bad UUID comparison when adding GATT service am: 33f424d493
Jakub Pawlowski [Thu, 19 Jan 2017 14:53:49 +0000 (14:53 +0000)]
Fix bad UUID comparison when adding GATT service am: 33f424d493
am: bd6197aae4

Change-Id: I8290d2055f06a869b964840bc205b8b8b89925b6

7 years agoFix bad UUID comparison when adding GATT service
Jakub Pawlowski [Thu, 19 Jan 2017 14:51:18 +0000 (14:51 +0000)]
Fix bad UUID comparison when adding GATT service
am: 33f424d493

Change-Id: I8552b9aa41c0852672a5ecf63ea39b8a289d27df

7 years agoFix bad UUID comparison when adding GATT service
Jakub Pawlowski [Thu, 19 Jan 2017 06:58:53 +0000 (22:58 -0800)]
Fix bad UUID comparison when adding GATT service

This patch fixes bad comparison in add_service_impl. Instead of checking
wether service is one of two excluded services, it was excluding all
services.

Test: sl4a GatReadTest
Bug: 34280184
Change-Id: I3195e94b6fafe4d2e3c61fc7bfd7398c2855b78e

7 years agoMerge "test_vendor: Make tryStartThread return 0 on success" am: 91b994faa6 am: 0e462...
Jorge E. Moreira [Thu, 19 Jan 2017 14:35:48 +0000 (14:35 +0000)]
Merge "test_vendor: Make tryStartThread return 0 on success" am: 91b994faa6 am: 0e462b4c9b
am: cafb73be1b

Change-Id: Iac493668119c7489586792f66e53725d3609c674

7 years agoMerge "test_vendor: Make tryStartThread return 0 on success" am: 91b994faa6
Jorge E. Moreira [Thu, 19 Jan 2017 14:32:16 +0000 (14:32 +0000)]
Merge "test_vendor: Make tryStartThread return 0 on success" am: 91b994faa6
am: 0e462b4c9b

Change-Id: If36b548d7b58060d920caef2fea0d13f3fe3e596

7 years agoMerge "test_vendor: Make tryStartThread return 0 on success"
Jorge E. Moreira [Thu, 19 Jan 2017 14:30:13 +0000 (14:30 +0000)]
Merge "test_vendor: Make tryStartThread return 0 on success"
am: 91b994faa6

Change-Id: I54671e84b39953a5e38e7b41a5275800de9c06b4

7 years agoMerge "test_vendor: Make tryStartThread return 0 on success"
Treehugger Robot [Thu, 19 Jan 2017 14:26:33 +0000 (14:26 +0000)]
Merge "test_vendor: Make tryStartThread return 0 on success"

7 years agotest_vendor: Make tryStartThread return 0 on success
Jorge E. Moreira [Thu, 19 Jan 2017 00:34:42 +0000 (16:34 -0800)]
test_vendor: Make tryStartThread return 0 on success

Test: Start the test vendor library with no error message
Bug: 34357009
Change-Id: Id2821199ad675e2b95a9f333afa803dcced811a3

7 years agoFix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR am: a643b5b0df am: 4c56d8f849
Jack He [Thu, 19 Jan 2017 03:42:09 +0000 (03:42 +0000)]
Fix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR am: a643b5b0df am: 4c56d8f849
am: d08ce780b7

Change-Id: Id9e5ca306c894c1af8c2b1e2136892b87616e794

7 years agoFix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR am: a643b5b0df
Jack He [Thu, 19 Jan 2017 03:40:09 +0000 (03:40 +0000)]
Fix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR am: a643b5b0df
am: 4c56d8f849

Change-Id: I5dcd31ca425b25286fb86ca0e48015c4514f3b8d

7 years agoFix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
Jack He [Thu, 19 Jan 2017 03:37:37 +0000 (03:37 +0000)]
Fix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
am: a643b5b0df

Change-Id: I3c4d7ccfcfbcb0faa151776ecd325891d14f38f5

7 years agoFix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
Jack He [Thu, 19 Jan 2017 01:14:08 +0000 (17:14 -0800)]
Fix parser for BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR

* Current parser does not support multi-directory lists, which may cause
  a build failure if BoardConfig.mk defines one.
* This CL splits the list of directories using whitespace and adds them
  individually to the include list

Bug: 34396100
Test: Code compilation, no user visible effect
Change-Id: I59e901d76d1bc20f50b54941a3007c5521ded214

7 years agoConvert build system to soong using Android.bp am: e2eeff4f7f am: bfd636ce15
Jack He [Wed, 18 Jan 2017 22:22:17 +0000 (22:22 +0000)]
Convert build system to soong using Android.bp am: e2eeff4f7f am: bfd636ce15
am: 14138386dd

Change-Id: I4724ce78d610e82f3f2eb8eeed6dc491d124b8d2

7 years agoConvert build system to soong using Android.bp am: e2eeff4f7f
Jack He [Wed, 18 Jan 2017 22:20:18 +0000 (22:20 +0000)]
Convert build system to soong using Android.bp am: e2eeff4f7f
am: bfd636ce15

Change-Id: Id194d1c543cc52f52e93016f3ae37a3207527219