OSDN Git Service

android-x86/system-bt.git
5 years ago[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2...
Ugo Yu [Fri, 8 Feb 2019 01:06:02 +0000 (17:06 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: f3681c8616 -s ours
am: 9028a31640

Change-Id: I31a0260c1ff35d1452b214139ccedb0aa0edd6db

5 years agoMerge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
Ugo Yu [Fri, 8 Feb 2019 01:05:33 +0000 (17:05 -0800)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
am: 7799b0915e

Change-Id: I840df80cb967dccce932634818c901b79e52b2ff

5 years ago[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
Ugo Yu [Fri, 8 Feb 2019 00:44:14 +0000 (16:44 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am: f3681c8616 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a7d8107caa959212e0d93e708dd87851199a2c8

5 years agoMerge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
TreeHugger Robot [Thu, 7 Feb 2019 23:42:23 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am...
Hansong Zhang [Thu, 7 Feb 2019 21:32:37 +0000 (13:32 -0800)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am: e145805974 am: 9b0e9a32bb am: 53e961c220
am: 8c5cac9acf

Change-Id: I8e49f1c168d9fc71279321b0d1b5762af845dee7

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am...
Hansong Zhang [Thu, 7 Feb 2019 21:25:32 +0000 (13:25 -0800)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am: e145805974 am: 9b0e9a32bb
am: 53e961c220

Change-Id: I9fc3a00e1b38236aaa1016ef0c422fe5303f407b

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am...
Hansong Zhang [Thu, 7 Feb 2019 21:21:26 +0000 (13:21 -0800)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am: e145805974
am: 9b0e9a32bb

Change-Id: I02f1344805f748024dc28e05fd0afe67a6afb61a

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
Hansong Zhang [Thu, 7 Feb 2019 21:17:35 +0000 (13:17 -0800)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
am: e145805974

Change-Id: Iaa78778cedd6e04d3cf7d009b81a9599658e6583

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0 skipped: 84ba34d57a
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

5 years agoMerge "Add a ClassOfDevice type" am: 1127b7ca1e
Myles Watson [Thu, 7 Feb 2019 04:17:16 +0000 (20:17 -0800)]
Merge "Add a ClassOfDevice type" am: 1127b7ca1e
am: 1d4d929b97

Change-Id: I90ba1f5a150a1e21bb0a70c7f91d2c610a14895c

5 years agoMerge "Add a ClassOfDevice type"
Myles Watson [Thu, 7 Feb 2019 04:13:16 +0000 (20:13 -0800)]
Merge "Add a ClassOfDevice type"
am: 1127b7ca1e

Change-Id: I24c9a22d2dfb000c6778fde7150038445c90b218

5 years agoMerge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid" am: d5b9a48dd4
Cheney Ni [Thu, 7 Feb 2019 04:05:13 +0000 (20:05 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid" am: d5b9a48dd4
am: 4ba03befa9

Change-Id: Id21a5e868ecc1463431ef7be0d55f04503df3bb9

5 years agoMerge "Add a ClassOfDevice type"
Treehugger Robot [Thu, 7 Feb 2019 04:04:02 +0000 (04:04 +0000)]
Merge "Add a ClassOfDevice type"

5 years agoMerge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
Cheney Ni [Thu, 7 Feb 2019 03:51:29 +0000 (19:51 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
am: d5b9a48dd4

Change-Id: I1d553f74fb1c81b9796225cf3a0fba2faa43c6b4

5 years agoMerge "Metrics: Log SDP attributes to statsd" am: 56906d7952
Jack He [Thu, 7 Feb 2019 03:49:56 +0000 (19:49 -0800)]
Merge "Metrics: Log SDP attributes to statsd" am: 56906d7952
am: 39f25666c6

Change-Id: I758d891e86ab6a23559907948fa0e8cdcc9286ac

5 years agoMerge "Metrics: Log SDP attributes to statsd"
Jack He [Thu, 7 Feb 2019 03:46:54 +0000 (19:46 -0800)]
Merge "Metrics: Log SDP attributes to statsd"
am: 56906d7952

Change-Id: I0bf9a363b011ad546824b9826b9721e391cf5b5a

5 years agoMerge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
Treehugger Robot [Thu, 7 Feb 2019 03:39:00 +0000 (03:39 +0000)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"

5 years agoMerge "Metrics: Log SDP attributes to statsd"
Treehugger Robot [Thu, 7 Feb 2019 03:35:01 +0000 (03:35 +0000)]
Merge "Metrics: Log SDP attributes to statsd"

5 years agoMetrics: Log SDP attributes to statsd
Jack He [Sat, 2 Feb 2019 02:30:21 +0000 (18:30 -0800)]
Metrics: Log SDP attributes to statsd

* Log ProtocolDescriptorList's protocol version field to statsd
* Log BluetoothProfileDescriptorList's profile version field to statsd
* Log SupportedFeatures for A2DP, HFP, AVRCP, PBAP, MAP to statsd
* Log SDP metrics before we disconnect from L2CAP during SDP discovery
* Values are logged in small endian array
* Do this logging before we declare an SDP search is done

Bug: 112969790
Test: make, test drive with statsd
Change-Id: Idd340e495ecb85abc27de2b2d71305ee5218b43c

5 years agoAdd audio channel of Bluetooth Audio Hal v2 for Hearing Aid
Cheney Ni [Wed, 12 Dec 2018 12:20:28 +0000 (20:20 +0800)]
Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid

This brings a new interface for Hearing Aid to communicate with audio.
Both audio control and data path go through the new Bluetooth audio
HAL and is similar to A2DP usecase. It initials this interface of client
side and get audio provider at setup and manage session with audio hal.

There is a system property to switch between the UIPC socket and the
Bluetooth Audio Hal v2 interface:
    persist.bluetooth.bluetooth_audio_hal.enabled

Bug: 111519504
Bug: 120222104
Test: manual test with Hearing Aid
TODO: Pass audio matadata into Hearing Aid service

Change-Id: I648775d61a8a4fe4fa680dd31ffc39fc89267c06

5 years agoMerge "Add stack side interface for Bluetooth audio HAL V2" am: 9ac498e5f3
Cheney Ni [Thu, 7 Feb 2019 00:14:14 +0000 (16:14 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2" am: 9ac498e5f3
am: 03b104281d

Change-Id: I76c95b532437bb754685cd07ebe71d2f8285c583

5 years agoMerge "Add stack side interface for Bluetooth audio HAL V2"
Cheney Ni [Thu, 7 Feb 2019 00:10:11 +0000 (16:10 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2"
am: 9ac498e5f3

Change-Id: Id1b7339721558e2772eca4ce9eebb57a51a04f9d

5 years agoMerge "Add stack side interface for Bluetooth audio HAL V2"
Treehugger Robot [Thu, 7 Feb 2019 00:00:28 +0000 (00:00 +0000)]
Merge "Add stack side interface for Bluetooth audio HAL V2"

5 years agoMerge "PBAP Client SDP record" am: 02efe2113f
Joseph Pirozzo [Wed, 6 Feb 2019 21:26:06 +0000 (13:26 -0800)]
Merge "PBAP Client SDP record" am: 02efe2113f
am: aa513eab75

Change-Id: Ica014e4e2c09b033797f42e10477ab2d873da510

5 years agoMerge "PBAP Client SDP record"
Joseph Pirozzo [Wed, 6 Feb 2019 21:21:54 +0000 (13:21 -0800)]
Merge "PBAP Client SDP record"
am: 02efe2113f

Change-Id: Ie681046a23a481471608df00d1367271a6be0229

5 years agoAdd stack side interface for Bluetooth audio HAL V2
Cheney Ni [Thu, 8 Nov 2018 08:41:02 +0000 (16:41 +0800)]
Add stack side interface for Bluetooth audio HAL V2

This bases on the new Bluetooth Audio HAL V2 to provide a HIDL based
interface for the stack. There will be a common interface named
BluetoothAudioClientInterface that the stack can register its session for
stream of A2DP or Hearing Aid. When the stack registers to this
pre-implemented BluetoothAudioClientInterface, the audio HAL can control
the stream state and the stack can report results to the audio HAL.
When running for software encoding, there will also data path via FMQ to
provide the bridge between audio HAL and the stack. This change contains
A2DP software encoding (legacy) only.

Bug: 111519504
Test: manual with A2DP software encoding (legacy)

Change-Id: Iac5a43c929d4036fa86e2b0c2c2920ca2b9dfa50

5 years agoMerge "PBAP Client SDP record"
Joseph Pirozzo [Wed, 6 Feb 2019 21:10:24 +0000 (21:10 +0000)]
Merge "PBAP Client SDP record"

5 years agoAdd generic audio HW module for Bluetooth audio HAL V2 am: aef115f777
Cheney Ni [Tue, 5 Feb 2019 22:41:11 +0000 (14:41 -0800)]
Add generic audio HW module for Bluetooth audio HAL V2 am: aef115f777
am: bb067fe71d

Change-Id: I8b12a96dbb361d850bd605eba394e88180379565

5 years agoAdd generic audio HW module for Bluetooth audio HAL V2
Cheney Ni [Tue, 5 Feb 2019 22:36:05 +0000 (14:36 -0800)]
Add generic audio HW module for Bluetooth audio HAL V2
am: aef115f777

Change-Id: I05e5eeea39f01834ac490973047475d818b86a76

5 years agoAdd generic audio HW module for Bluetooth audio HAL V2
Cheney Ni [Wed, 7 Nov 2018 00:41:55 +0000 (08:41 +0800)]
Add generic audio HW module for Bluetooth audio HAL V2

This is loaded from audio HAL when initials the audio HW module,
bluetooth_audio, and uses Bluetooth audio HAL V2 to provide stream APIs
for control and data path. When the audio framework opens different
input or output streams, it uses the audio device type to choose which
SessionType is and pass to Bluetooth audio HAL so associates with the
Provider / Port pair and communicate with the Bluetooth stack.

* Audio contrl path uses IBluetoothAudioPort interface to interact with
  the Bluetooth stack.
* Audio data path uses HIDL Fast Message Queue that is maintained within
  IBluetoothAudioProvider HIDL and is ready after session started.

Bug: 111519504
Bug: 122503379
Test: manual

Change-Id: Ie668456179357c26397f5c6234ff46b5308dfe24

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am...
Hansong Zhang [Sat, 2 Feb 2019 08:17:27 +0000 (00:17 -0800)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am: 8ea254e227 am: 04f9bde9ea am: a99a5f342a
am: 812588ad71

Change-Id: Iee2d82f39de0c5bf5eb5eb846d88ca87feb12c95

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am...
Hansong Zhang [Sat, 2 Feb 2019 08:13:14 +0000 (00:13 -0800)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am: 8ea254e227 am: 04f9bde9ea
am: a99a5f342a

Change-Id: I84c36724790660df845bb3a5ade56f792601ca0d

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am...
Hansong Zhang [Sat, 2 Feb 2019 08:09:09 +0000 (00:09 -0800)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am: 8ea254e227
am: 04f9bde9ea

Change-Id: I2f9ab4cc670a7faa7305fe110a964168bd4c40d5

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev
Hansong Zhang [Sat, 2 Feb 2019 08:05:14 +0000 (00:05 -0800)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev
am: 8ea254e227

Change-Id: Ifc5a20abe1c8091f4850cd3d75f9ecfb4474f11e

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev

* changes:
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af am: d0584f3dcf skipped: 55b702e6c4
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af am: d0584f3dcf
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93
  DO NOT MERGE process_l2cap_cmd: Fix OOB

5 years agoresolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
Hansong Zhang [Sat, 2 Feb 2019 04:54:07 +0000 (20:54 -0800)]
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
am: 6c0f22f324

Change-Id: Ic65233e9644f69567086a674b654f6a3b30b838e

5 years agoresolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
Hansong Zhang [Sat, 2 Feb 2019 01:45:30 +0000 (17:45 -0800)]
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id658b3485fdc0025bc44850be9f23bb2d2146d9b

5 years agoMetrics: Add classic pairing metrics am: 16e6adb75b
Jack He [Fri, 1 Feb 2019 23:43:03 +0000 (15:43 -0800)]
Metrics: Add classic pairing metrics am: 16e6adb75b
am: d6479e3a78

Change-Id: I3b14e5b204acaeb103fe21edd854416021e25298

5 years agoMetrics: Add classic pairing metrics
Jack He [Fri, 1 Feb 2019 23:39:58 +0000 (15:39 -0800)]
Metrics: Add classic pairing metrics
am: 16e6adb75b

Change-Id: I79755761aa7236dda7b59791248b47a84bf111ad

5 years agoMerge "process_l2cap_cmd: Fix OOB" into oc-dev am: 356edb4333
Hansong Zhang [Fri, 1 Feb 2019 23:39:08 +0000 (15:39 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev am: 356edb4333
am: 82365b0e8d

Change-Id: I4f04fad60e84785f474390e473d2fcf19f66a044

5 years agoMerge "process_l2cap_cmd: Fix OOB" into oc-dev
Hansong Zhang [Fri, 1 Feb 2019 23:33:09 +0000 (15:33 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
am: 356edb4333

Change-Id: I0e1800587513bdb39e0b6eff7e46254470ab2def

5 years agoMerge "process_l2cap_cmd: Fix OOB" into oc-dev
TreeHugger Robot [Fri, 1 Feb 2019 23:18:22 +0000 (23:18 +0000)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev

5 years agoMetrics: Add classic pairing metrics
Jack He [Fri, 1 Feb 2019 01:44:46 +0000 (17:44 -0800)]
Metrics: Add classic pairing metrics

* Log HCI commands and events related to classic pairing
* Move all metrics logging for sending HCI command into a single
  function
* Move all metrics logging for HCI command status into a single function
* Move all metrics logging for HCI Command complete into a single
  function
* Move all metrics logging for HCI events into a single function
* Make sure we log all instances of HCI command sending methods,
  including those with desinated callbacks

Bug: 112969790
Test: make, testdrive with statsd
Change-Id: I4b1ca4ee814096d84bcd93c8d7206b0a771a3210

5 years agoMerge "Metrics: Log SMP pairing commands" am: b11e36df28
Jack He [Fri, 1 Feb 2019 02:11:49 +0000 (18:11 -0800)]
Merge "Metrics: Log SMP pairing commands" am: b11e36df28
am: 8c48ac2ccd

Change-Id: I45d48dfda68c4ee6928b7bc1ea3731609406a072

5 years agoMerge "Metrics: Log SMP pairing commands"
Jack He [Fri, 1 Feb 2019 02:07:42 +0000 (18:07 -0800)]
Merge "Metrics: Log SMP pairing commands"
am: b11e36df28

Change-Id: I7b20427bbec13e6a12cdc5a2a529480c9b6f5865

5 years agoMerge "Metrics: Log SMP pairing commands"
Treehugger Robot [Fri, 1 Feb 2019 01:57:35 +0000 (01:57 +0000)]
Merge "Metrics: Log SMP pairing commands"

5 years agoPBAP Client SDP record
Joseph Pirozzo [Thu, 17 Jan 2019 00:50:10 +0000 (16:50 -0800)]
PBAP Client SDP record

Add registration for PBAP Client SDP record when service is available.

Bug: 113505152
Test: Check SDP record via "sdptool browse"
Change-Id: I067eccbe0db17e32d0fc57ed57813fe1e63536d1

5 years agoMetrics: Log SMP pairing commands
Jack He [Thu, 31 Jan 2019 23:17:08 +0000 (15:17 -0800)]
Metrics: Log SMP pairing commands

* Log SMP pairing commands and pairing failure reasons

Bug: 112969790
Test: make, testdrive with statsd
Change-Id: I51ae2af981a687954f7de3cee3caacce43d782b6

5 years agoMerge "Hearing Aid: Removes all registrations for connection when disconnect HA"...
weichinweng [Thu, 31 Jan 2019 22:35:00 +0000 (14:35 -0800)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA" am: 221072caf0
am: 2488345077

Change-Id: Ia9730692af1c79afda93d208779fcd8bbde2323c

5 years agoMerge "Hearing Aid: Removes all registrations for connection when disconnect HA"
weichinweng [Thu, 31 Jan 2019 22:26:50 +0000 (14:26 -0800)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA"
am: 221072caf0

Change-Id: I83875ebb05219a9453ba03d2abf6cfb3386a0bb4

5 years agoMerge "Hearing Aid: Removes all registrations for connection when disconnect HA"
Treehugger Robot [Thu, 31 Jan 2019 22:15:48 +0000 (22:15 +0000)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA"

5 years agoFix race condition during LE device remove bond. am: 552dc5aa3f
Jakub Pawlowski [Thu, 31 Jan 2019 21:49:20 +0000 (13:49 -0800)]
Fix race condition during LE device remove bond. am: 552dc5aa3f
am: fff4478b8d

Change-Id: I0ac9068dc2a773d34a8a3bbca18a76dd9a4754c5

5 years agoFix race condition during LE device remove bond.
Jakub Pawlowski [Thu, 31 Jan 2019 21:45:00 +0000 (13:45 -0800)]
Fix race condition during LE device remove bond.
am: 552dc5aa3f

Change-Id: If138f7c19d12a40bd4809a25705a839ec5cfe60f

5 years agoFix race condition during LE device remove bond.
Jakub Pawlowski [Thu, 17 Jan 2019 21:31:39 +0000 (22:31 +0100)]
Fix race condition during LE device remove bond.

BTA_GATTC_CancelOpen doesn't execute immediately, but rather schedule
operation for execution later. During bond removal, we must make sure
that device is removed from white list before it's removed from
resolving list. Calling GATT_CancelConnect directly fixes this issue.

Additionally, after checking the logic, unconditional remove should
remove all connection attempts, including direct connections, rather
than just background connections.

Bug: 122918938
Bug: 112827989
Test: re-bond hearing aids
Change-Id: I9d861b7d83ea4da9c2a278eea2e34f2b7aca2417

5 years agoMerge "Hearing Aid: Add python script to dump audio data to file" am: 3d83656421
Weichin Weng [Thu, 31 Jan 2019 06:07:16 +0000 (22:07 -0800)]
Merge "Hearing Aid: Add python script to dump audio data to file" am: 3d83656421
am: ff234cd483

Change-Id: I0cf4fa0c535b098f156a65f12f08cb596c80d762

5 years agoMerge "Hearing Aid: Add python script to dump audio data to file"
Weichin Weng [Thu, 31 Jan 2019 05:52:10 +0000 (21:52 -0800)]
Merge "Hearing Aid: Add python script to dump audio data to file"
am: 3d83656421

Change-Id: I095bbae469527f4a302695720fb3146d6a9b6ea1

5 years agoMerge "Hearing Aid: Add python script to dump audio data to file"
Weichin Weng [Thu, 31 Jan 2019 05:39:08 +0000 (05:39 +0000)]
Merge "Hearing Aid: Add python script to dump audio data to file"

5 years agoMerge "Metrics: Log A2DP playback related atoms to StatsLog" am: 60677562f5
Jack He [Thu, 31 Jan 2019 00:35:01 +0000 (16:35 -0800)]
Merge "Metrics: Log A2DP playback related atoms to StatsLog" am: 60677562f5
am: fae2f5dda3

Change-Id: I6d63afc867623afee1db2af4eaee49788574c669

5 years agoMerge "Metrics: Log A2DP playback related atoms to StatsLog"
Jack He [Thu, 31 Jan 2019 00:30:59 +0000 (16:30 -0800)]
Merge "Metrics: Log A2DP playback related atoms to StatsLog"
am: 60677562f5

Change-Id: I4f949c1016cff222a7e51f45d431b10bcbc547a6

5 years agoMerge "Metrics: Log A2DP playback related atoms to StatsLog"
Treehugger Robot [Thu, 31 Jan 2019 00:14:09 +0000 (00:14 +0000)]
Merge "Metrics: Log A2DP playback related atoms to StatsLog"

5 years agoFix for infinite loop in gatt_enc_cmpl_cback am: 92dbc8654d
Jakub Pawlowski [Wed, 30 Jan 2019 22:21:25 +0000 (14:21 -0800)]
Fix for infinite loop in gatt_enc_cmpl_cback am: 92dbc8654d
am: f0535d1c45

Change-Id: Ic3bdc7b0ce9b9052fb94d60b86a722f84f0e33c7

5 years agoFix for infinite loop in gatt_enc_cmpl_cback
Jakub Pawlowski [Wed, 30 Jan 2019 22:13:17 +0000 (14:13 -0800)]
Fix for infinite loop in gatt_enc_cmpl_cback
am: 92dbc8654d

Change-Id: Idbad9e06e1267a458d05d329236be7c393f54cf0

5 years agoMetrics: Log A2DP playback related atoms to StatsLog
Jack He [Mon, 21 Jan 2019 05:31:12 +0000 (21:31 -0800)]
Metrics: Log A2DP playback related atoms to StatsLog

* BluetoothA2dpAudioOverrunReported
  - Logs when A2DP failed send encoded data to the remote device fast
    enough such that the transmit buffer queue is full and we have to
    drop data
* BluetoothA2dpAudioUnderrunReported
  - Logs when A2DP failed to read from PCM source
* BluetoothDeviceRssiReported
  - Logged when remote device's RSSI level is reported by the controller
* BluetoothDeviceFailedContactCounterReported
  - Logged when ACL transmit queue was flushed by the controller
  - This is normally disabled unless we set automatic flush timeout was
    set to a non-zero value
  - However, when this event is reported, the connection quality must
    be very bad
* BluetoothDeviceTxPowerLevelReported
  - Logged when transmit power level is reported for a particular
    connection

Note on num_dropped_nanoseconds entry:
  - This is the duration of audio dropped and is calculated by
    multiplying the number of encoding actions with length of encoding
    interval

Bug: 112969790
Test: make, testdrive with statsd
Change-Id: Ie6aa5ee71dea213e452497dd181fee91eea8f7b4

5 years agoFix for infinite loop in gatt_enc_cmpl_cback
Jakub Pawlowski [Wed, 30 Jan 2019 15:39:22 +0000 (16:39 +0100)]
Fix for infinite loop in gatt_enc_cmpl_cback

Bug: 123574849
Change-Id: Id680cc794326b5d00c28dadf0d7aad98c0e4a5f2

5 years agoMetrics: Add Bluetooth quality report to statsd am: 12724bd83b
Jack He [Wed, 30 Jan 2019 10:29:02 +0000 (02:29 -0800)]
Metrics: Add Bluetooth quality report to statsd am: 12724bd83b
am: 11d39fbe70

Change-Id: I671671ed3be110c5b9fa229c75d669d54392d2bb

5 years agoMetrics: Add Bluetooth quality report to statsd
Jack He [Wed, 30 Jan 2019 10:07:04 +0000 (02:07 -0800)]
Metrics: Add Bluetooth quality report to statsd
am: 12724bd83b

Change-Id: Ibceca50f90ba325db47a03983ebdf693cfaed90e

5 years agoMetrics: Add Bluetooth quality report to statsd
Jack He [Tue, 29 Jan 2019 22:51:46 +0000 (14:51 -0800)]
Metrics: Add Bluetooth quality report to statsd

Bug: 112969790
Test: make, test drive with statsd
Change-Id: I20232facbd40f7f49bf574f47754ba5222a2aa34

5 years agoMerge changes I79037ddb,I9bab0078 am: 3fb1b1b89e
Jack He [Wed, 30 Jan 2019 05:28:59 +0000 (21:28 -0800)]
Merge changes I79037ddb,I9bab0078 am: 3fb1b1b89e
am: e7971c55d4

Change-Id: I31ac559037237cc282c27f99b4c781ee54f5e367

5 years agoMerge changes I79037ddb,I9bab0078
Jack He [Wed, 30 Jan 2019 05:15:26 +0000 (21:15 -0800)]
Merge changes I79037ddb,I9bab0078
am: 3fb1b1b89e

Change-Id: I0cbba0d141d93f342ae6e6f1a24a8b3266c8092f

5 years agoMerge changes I79037ddb,I9bab0078
Treehugger Robot [Wed, 30 Jan 2019 04:57:36 +0000 (04:57 +0000)]
Merge changes I79037ddb,I9bab0078

* changes:
  Metrics: add remote version info log to statsd
  Metrics: Log HCI timeout event over stats log

5 years agoDO NOT MERGE Separate SDP procedure from bonding state (1/2)
Ugo Yu [Tue, 16 Oct 2018 06:53:35 +0000 (14:53 +0800)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

- Do not stay in bonding state if the device is paried but still
  discovering service.
- Report BOND_BONDED to Java after authentication is completed.
- Report empty UUID to Java if a classic Bluetooth device SDP
  failed while pairing.
- Hold BOND_BONDED intent util SDP is findished.
- Only accept profile connection for the device is at bonded
  state. Any attempt to connect while bonding would potentially
  lead to an unauthorized connection.

Bug: 79703832
Test: runtest bluetooth, regression test
Change-Id: I023713e07308bfc0e5bb8d67f386bcc50f6a0f85
(cherry picked from commit 122e115b87fe98ca5e5e65b9765c146f9e52b65e)

5 years agoMetrics: add remote version info log to statsd
Jack He [Tue, 29 Jan 2019 22:49:34 +0000 (14:49 -0800)]
Metrics: add remote version info log to statsd

Bug: 112969790
Test: make, test drive with statsd
Change-Id: I79037ddb6c4af3bf3e5cc8a890c8ee66652b8a81

5 years agoMetrics: Log HCI timeout event over stats log
Jack He [Mon, 21 Jan 2019 07:16:45 +0000 (23:16 -0800)]
Metrics: Log HCI timeout event over stats log

Fixes: 121213292
Bug: 111812273
Test: make, test drive with statsd
Change-Id: I9bab0078a1e45c9811fd63f4c5aef9f4704ac555

5 years agoUsing std::promise and std::future to block till A2DP device activated am: f0999d8be8
Cheney Ni [Wed, 30 Jan 2019 01:58:46 +0000 (17:58 -0800)]
Using std::promise and std::future to block till A2DP device activated am: f0999d8be8
am: c7f7d727e2

Change-Id: I6fe9507733ed49160853c7cbc1690faf87497092

5 years agoUsing std::promise and std::future to block till A2DP device activated
Cheney Ni [Wed, 30 Jan 2019 01:52:39 +0000 (17:52 -0800)]
Using std::promise and std::future to block till A2DP device activated
am: f0999d8be8

Change-Id: Ic013217fb07dd1c3aa33623c641ae47c915730bf

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am: 1946090...
Hansong Zhang [Wed, 30 Jan 2019 01:05:50 +0000 (17:05 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am: 19460901d8 am: 154230b832 am: a3a57067d0
am: f4aa470028

Change-Id: I20fca0d1bb08a631d03be5ad201d1e61a388f8c2

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am: 1946090...
Hansong Zhang [Wed, 30 Jan 2019 01:02:43 +0000 (17:02 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am: 19460901d8 am: 154230b832
am: a3a57067d0

Change-Id: Ib76648858de768c8b3db411eda84efe7abbd420f

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am: 19460901d8
Hansong Zhang [Wed, 30 Jan 2019 00:56:34 +0000 (16:56 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev am: 19460901d8
am: 154230b832

Change-Id: I69aba9f5350a2b4510e49494839bbff6369c8b4a

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
Hansong Zhang [Wed, 30 Jan 2019 00:49:16 +0000 (16:49 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
am: 19460901d8

Change-Id: If4f3b40817ff57bdae4777ae330854a9119ae0b7

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
TreeHugger Robot [Wed, 30 Jan 2019 00:25:28 +0000 (00:25 +0000)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev

5 years agoUsing std::promise and std::future to block till A2DP device activated
Cheney Ni [Wed, 19 Dec 2018 10:46:18 +0000 (18:46 +0800)]
Using std::promise and std::future to block till A2DP device activated

There is a new interface to replace UIPC with Blueototh Audio Hal v2 and
synchronization issues between BT Stack and Audio Hal was found when
activating a new A2DP device. Because the API to activate an A2DP device
was non-blocking, it was possilbe that there was a race condition when
BT Stack starting A2DP session and Audio Hal was opening A2DP output.
There was a chance that the output was opened before session started and
causing A2DP to have no sound.

This CL uses std::promise and std::future are able to achieve the
serialize of starting session and opening output for A2DP.

Bug: 111519504
Bug: 122505783
Test: A2DP reconnection and switching

Change-Id: I88c42ea1eb5f8def2345dbfaab26c6d1a91c54cc

5 years agoHearing Aid: Add python script to dump audio data to file
weichinweng [Thu, 20 Dec 2018 07:03:37 +0000 (15:03 +0800)]
Hearing Aid: Add python script to dump audio data to file

Bug: 121005659
Test: ./dump_hearingaid_audio.py btsnoop_hci.log
      ./dump_hearingaid_audio.py -f folder btsnoop_hci.log
      ./dump_hearingaid_audio.py -f folder -c1 1 -c2 3 btsnoop_hci.log
      ./dump_hearingaid_audio.py -f folder -a 121 btsnoop_hci.log
Change-Id: I304531ecb5c5bd6cfc264130176d26acc60a64c2

5 years agoAdd IdGenerator am: 23478f71d0
Jakub Pawlowski [Tue, 29 Jan 2019 07:56:01 +0000 (23:56 -0800)]
Add IdGenerator am: 23478f71d0
am: 0bc4579ba3

Change-Id: I59e5cff32382a1c6cc86aa163ea8baa89a15e07d

5 years agoAdd IdGenerator
Jakub Pawlowski [Tue, 29 Jan 2019 07:51:56 +0000 (23:51 -0800)]
Add IdGenerator
am: 23478f71d0

Change-Id: I974608ed960f88067abfbab07f917de8950f4522

5 years agoHearing Aid: Removes all registrations for connection when disconnect HA
weichinweng [Mon, 21 Jan 2019 11:22:33 +0000 (19:22 +0800)]
Hearing Aid: Removes all registrations for connection when disconnect HA

* On the current design, when the disconnect Hearing Aid is triggered
from UI. It will Cancel autoconnect by gatt_if first. It will cause the
fixed_chnl_idle_tout isn't set. On the condition, it will cause the
disconnect isn't finished.
* The fix is change the behavior. Directly remove all registrations for
connection when disconnect HA.

Bug: 122264537
Bug: 123214035
Test: make, BT off/on when connected HA,
Toggle disconnect/connect HA from Bluetooth UI,
Turn off/onn HA after Connected HA.

Change-Id: If011c1ab632e1fcb51a68b3c122743534b5f6c63

5 years agoAdd IdGenerator
Jakub Pawlowski [Wed, 8 Aug 2018 14:32:44 +0000 (16:32 +0200)]
Add IdGenerator

Test: added unit test
Bug: 67058417
Change-Id: I41a9200cbf703f5404f312e4cb1199b640e86270

5 years agoBQR: Cleanup BQR header definititon am: 63aca79a30
Jack He [Sat, 26 Jan 2019 02:36:20 +0000 (18:36 -0800)]
BQR: Cleanup BQR header definititon am: 63aca79a30
am: 9187066d98

Change-Id: I246b31e6bbf9e9bbeb27dd3a8339e62f9b81361e

5 years agoBQR: Cleanup BQR header definititon
Jack He [Sat, 26 Jan 2019 02:33:12 +0000 (18:33 -0800)]
BQR: Cleanup BQR header definititon
am: 63aca79a30

Change-Id: Ie3780d6f6382ca82f2f809d4359ee20aa84f0cc3

5 years agoBQR: Cleanup BQR header definititon
Jack He [Fri, 25 Jan 2019 21:45:16 +0000 (13:45 -0800)]
BQR: Cleanup BQR header definititon

* Rename persist.bluetooth.bqr.eventmask to persist.bluetooth.bqr.event_mask
* Rename persist.bluetooth.bqr.interval to
  persist.bluetooth.bqr.min_interval_ms
* Rename all instances of reporting interval to minimum report interval
  milliseconds
* Add zero initialization to all event values
* Add comment on the unit of timestamp and piconet clock

Bug: 111384296
Test: make, no functional change
Change-Id: I5174297ec314a862da7591bcf3aefea9b6778f1a

5 years ago[automerger skipped] DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency...
Suren Baghdasaryan [Fri, 25 Jan 2019 17:31:02 +0000 (09:31 -0800)]
[automerger skipped] DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include"" am: fc27af1a25 -s ours
am: d6fa46a515 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic185d138e9f6fed533a126083743310e197e00a7

5 years ago[automerger skipped] DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency...
Suren Baghdasaryan [Fri, 25 Jan 2019 17:20:42 +0000 (09:20 -0800)]
[automerger skipped] DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include""
am: fc27af1a25 -s ours
am skip reason: subject contains skip directive

Change-Id: I1586c715e769e192e2d37350279152ec084cbce3

5 years agoBQR: Add Bluetooth Quality Report feature am: 6e632477a4
Ray [Fri, 25 Jan 2019 17:04:38 +0000 (09:04 -0800)]
BQR: Add Bluetooth Quality Report feature am: 6e632477a4
am: 5d7470d629

Change-Id: I3ecd5ef0c6474c7368a05176af71785e74a2571e

5 years agoBQR: Add Bluetooth Quality Report feature
Ray [Fri, 25 Jan 2019 17:00:23 +0000 (09:00 -0800)]
BQR: Add Bluetooth Quality Report feature
am: 6e632477a4

Change-Id: I7f3684b437ea914eb446bcdafb83f19d870944de

5 years agoDO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy...
Suren Baghdasaryan [Fri, 25 Jan 2019 05:34:11 +0000 (05:34 +0000)]
DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy include""

This reverts commit e5751caf675fc0bee229f8c427564c2e927184fd.

Reason for revert: AOSP is fixed with new vendor image

Change-Id: I96db6ffe9cce3d5158b96c171026839d62ec3756
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
5 years agoBQR: Add Bluetooth Quality Report feature
Ray [Thu, 3 Jan 2019 13:19:16 +0000 (21:19 +0800)]
BQR: Add Bluetooth Quality Report feature

Bluetooth disconnects, voice and audio quality issues are sometimes hard
to debug without an OTA (Over The Air) log.
For debugging this kind of issue we would need to identify it belongs to
the host, Bluetooth controller/firmware, environment or the remote
Bluetooth device.
This feature would route the link and firmware/controller stats (ex: TX
power level, RSSI, Unused AFH channel count...) to the host when quality
events happen.

Quality Monitoring Mode:
The controller will periodically send Bluetooth Quality VSE sub-event to
the host.

Approaching LSTO:
Once no packets are received from the connected Bluetooth device for a
duration longer than the half of LSTO (Link Supervision Timeout) value,
the controller will report Approaching LSTO event to the host.

A2DP Audio Choppy:
When audio stall, the controller will report A2DP Audio Choppy event to
the host.

(e)SCO Voice Choppy:
The controller will report (e)SCO Voice Choppy event to the host if the
voice quality might be bad.

Bug: 111384296
Test: - Verified that all functionalites with the Bluetooth controller /
        firmware which supports Bluetooth Quality Report VSC
(OpCode: 0xFD5E) and Bluetooth Quality Report (Sub-event code:
0x58) of VSE.
      - Verified that this feature could work on both the A2DP HW
        offload and non-offload modes.

Change-Id: I3fd3000bace7606855cac3b9b87134499c0ca891

5 years agoConvert Android.mk file to Android.bp am: aa044495fc
Sasha Smundak [Fri, 25 Jan 2019 08:17:38 +0000 (00:17 -0800)]
Convert Android.mk file to Android.bp am: aa044495fc
am: dd0a988d8d

Change-Id: Ic7db6ba149e676faf617e1d76ee1df5cdd227c95

5 years agoConvert Android.mk file to Android.bp
Sasha Smundak [Fri, 25 Jan 2019 08:13:31 +0000 (00:13 -0800)]
Convert Android.mk file to Android.bp
am: aa044495fc

Change-Id: I8905a9c28b9fc76083655bda05145559b1a15162

5 years agoConvert Android.mk file to Android.bp
Sasha Smundak [Tue, 22 Jan 2019 21:46:37 +0000 (13:46 -0800)]
Convert Android.mk file to Android.bp

See build/soong/README.md for more information.

Change-Id: Ida03ab11c7fa6148fa5711ce1770b6951e831412
Fixes: 122332236
Test: treehugger

5 years agoSDP: Remove SDP_DEBUG_RAW flag am: fa84129932
Jack He [Fri, 25 Jan 2019 03:53:50 +0000 (19:53 -0800)]
SDP: Remove SDP_DEBUG_RAW flag am: fa84129932
am: 4b6af7e21a

Change-Id: I1d633060429314677684a1bd8eb8b9a0b8aac87e

5 years agoSDP: Remove SDP_DEBUG_RAW flag
Jack He [Fri, 25 Jan 2019 03:49:44 +0000 (19:49 -0800)]
SDP: Remove SDP_DEBUG_RAW flag
am: fa84129932

Change-Id: Id77bdfec4e2a4b91ece3d9264dbbbf327618478b