OSDN Git Service

android-x86/system-bt.git
5 years agoMerge "Prevent potential deadlock in Hearing Aids"
Stanley Tng [Wed, 21 Nov 2018 21:03:03 +0000 (13:03 -0800)]
Merge "Prevent potential deadlock in Hearing Aids"
am: 2fb03d8470

Change-Id: Id16264dd2cd55ab730323ed0d95adde1cb88431a

5 years agoMerge "HFP: Send caller ID in +CLIP command (3/4)"
Benson Li [Wed, 21 Nov 2018 20:57:56 +0000 (12:57 -0800)]
Merge "HFP: Send caller ID in +CLIP command (3/4)"
am: 0bcf573d91

Change-Id: Ib4d00ef1e727613a4363226115137f700464fe82

5 years agoMerge "Prevent potential deadlock in Hearing Aids"
Treehugger Robot [Wed, 21 Nov 2018 20:52:18 +0000 (20:52 +0000)]
Merge "Prevent potential deadlock in Hearing Aids"

5 years agoMerge "HFP: Send caller ID in +CLIP command (3/4)"
Treehugger Robot [Wed, 21 Nov 2018 20:21:19 +0000 (20:21 +0000)]
Merge "HFP: Send caller ID in +CLIP command (3/4)"

5 years agoMerge "btsock_signaled: provide debugging info for crash"
Hansong Zhang [Wed, 21 Nov 2018 20:14:21 +0000 (12:14 -0800)]
Merge "btsock_signaled: provide debugging info for crash"
am: f8da780d60

Change-Id: Ic7773644aba72a0310c15ae786b14d8fb11e9faf

5 years agoMerge "btsock_signaled: provide debugging info for crash"
Treehugger Robot [Wed, 21 Nov 2018 19:51:32 +0000 (19:51 +0000)]
Merge "btsock_signaled: provide debugging info for crash"

5 years agoMerge "btif_av: remove dead code"
Hansong Zhang [Wed, 21 Nov 2018 19:26:32 +0000 (11:26 -0800)]
Merge "btif_av: remove dead code"
am: 84f70f1152

Change-Id: I7ffedcf6dd730ff452ff68f1c7ce87ea71832305

5 years agoMerge "btif_av: remove dead code"
Treehugger Robot [Wed, 21 Nov 2018 19:04:36 +0000 (19:04 +0000)]
Merge "btif_av: remove dead code"

5 years agobtif_av: remove dead code
Hansong Zhang [Wed, 21 Nov 2018 00:04:18 +0000 (16:04 -0800)]
btif_av: remove dead code

Test: manual
Change-Id: I8b172ec2235ae5847f073f8d50ad71761bc37d02

5 years agoPrevent potential deadlock in Hearing Aids
Stanley Tng [Fri, 16 Nov 2018 19:34:28 +0000 (11:34 -0800)]
Prevent potential deadlock in Hearing Aids

Prevent a potential deadlock when calling the main thread but the main
thread is not running.

Bug: 117619792
Test: Manual test to make sure no regression
Change-Id: I6e001533144827b17b88547671765f790ed771bd

5 years agoMerge "Remove unused BTM_BleSetAdvParams"
Jakub Pawlowski [Tue, 20 Nov 2018 21:27:48 +0000 (13:27 -0800)]
Merge "Remove unused BTM_BleSetAdvParams"
am: 3b12d664e9

Change-Id: Ib265a9a6022765110c2e2c0cd338255863c2cbf5

5 years agoMerge "Remove unused BTM_BleSetAdvParams"
Treehugger Robot [Tue, 20 Nov 2018 21:13:35 +0000 (21:13 +0000)]
Merge "Remove unused BTM_BleSetAdvParams"

5 years agoLinux tests build fix
Jakub Pawlowski [Tue, 20 Nov 2018 21:09:37 +0000 (13:09 -0800)]
Linux tests build fix
am: 83db4992e3

Change-Id: Ieafc3eb4d4b4834f1475cdae8b5f72d637b49828

5 years agoRemove unused BTM_BleSetAdvParams
Jakub Pawlowski [Tue, 20 Nov 2018 11:14:10 +0000 (12:14 +0100)]
Remove unused BTM_BleSetAdvParams

Test: compilation
Change-Id: I5797a16b3fd92c5ffa1ad1fd048699a591fd1e4c

5 years agoLinux tests build fix
Jakub Pawlowski [Tue, 20 Nov 2018 18:27:11 +0000 (19:27 +0100)]
Linux tests build fix

Test: compile on Linux using ninja
Change-Id: I180679a7a6f12abe83db0480d9007ebdfdf1d451

5 years agoFix an error in pure virtual function in earlier CL
Stanley Tng [Fri, 16 Nov 2018 16:19:51 +0000 (08:19 -0800)]
Fix an error in pure virtual function in earlier CL
am: e72c597aa7

Change-Id: Ia8c01a258eb3fa2614751055dbef2b0807b20eb5

5 years agoFix an error in pure virtual function in earlier CL
Stanley Tng [Wed, 7 Nov 2018 20:50:37 +0000 (12:50 -0800)]
Fix an error in pure virtual function in earlier CL

The earlier CL "Fix Spurious Hearing Aid Start and Stop Cmds" is missing
this "=0" to make the virtual function pure. This CL fixes this
oversight.

Test: Compile
Bug: 117619792

Change-Id: Id9e72b8d93f9671c08a613ecb43b4121662770a0

5 years agobtsock_signaled: provide debugging info for crash
Hansong Zhang [Thu, 15 Nov 2018 23:37:12 +0000 (15:37 -0800)]
btsock_signaled: provide debugging info for crash

Test: manual
Bug: 68108403
Change-Id: I89cfc15787f51594535e1e0c00e7a18a317a5d81

5 years agoDump gatt::connection_manager state into bugreport
Jakub Pawlowski [Thu, 15 Nov 2018 07:20:01 +0000 (23:20 -0800)]
Dump gatt::connection_manager state into bugreport
am: 8ae68be3b8

Change-Id: Id19a8a93a055fda21dbb62888fa4db3f442bb4a9

5 years agoUse map instead of list for keeping apps interested in connection
Jakub Pawlowski [Thu, 15 Nov 2018 07:19:49 +0000 (23:19 -0800)]
Use map instead of list for keeping apps interested in connection
am: c436612cdc

Change-Id: Icd78c19959b2a88a5b1ad6164a09ee35fc77f2ec

5 years agoDump gatt::connection_manager state into bugreport
Jakub Pawlowski [Tue, 13 Nov 2018 14:41:42 +0000 (15:41 +0100)]
Dump gatt::connection_manager state into bugreport

Knowing what's in the white list is useful for debugging.

Bug: 112827989
Test: adb bugreport, verify content.
Change-Id: I195d1ee2fe277f0f0ef534c73f7a964c5f5e61b6

5 years agoUse map instead of list for keeping apps interested in connection
Jakub Pawlowski [Sat, 10 Nov 2018 15:45:35 +0000 (16:45 +0100)]
Use map instead of list for keeping apps interested in connection

Bug: 112827989
Test: BleGattConnectionManager
Change-Id: I7b7ea608f5e27a9f17141ccec0c5d5c06bb22e60

5 years agoFirst tests for connection management
Jakub Pawlowski [Tue, 13 Nov 2018 13:13:10 +0000 (05:13 -0800)]
First tests for connection management
am: e85bc52264

Change-Id: I1127e88d0b2c83eb00e1105af25cfe54ca21d203

5 years agointroduce gatt::connection_manager::get_apps_connecting_to
Jakub Pawlowski [Mon, 12 Nov 2018 23:36:23 +0000 (15:36 -0800)]
introduce gatt::connection_manager::get_apps_connecting_to
am: d1d3088e93

Change-Id: Idde98ec3cb082150cd57d7749be5d53c11745379

5 years agoNaming cleanup in stack/gatt/connection_manager.*
Jakub Pawlowski [Sat, 10 Nov 2018 13:37:14 +0000 (05:37 -0800)]
Naming cleanup in stack/gatt/connection_manager.*
am: d28727edd4

Change-Id: I73a6d1da304af64c986eba804011e6d9f0d6d4cc

5 years agoFirst tests for connection management
Jakub Pawlowski [Fri, 9 Nov 2018 13:41:01 +0000 (14:41 +0100)]
First tests for connection management

Test: added in this CL
Change-Id: Id3937530e1b0a16c056ae48face78b18c6ec32f0

5 years agointroduce gatt::connection_manager::get_apps_connecting_to
Jakub Pawlowski [Fri, 9 Nov 2018 17:40:04 +0000 (18:40 +0100)]
introduce gatt::connection_manager::get_apps_connecting_to

This is to clean up the interface, and don't expose internal control
structures.

Test: compilation
Change-Id: Id2afc5efb4c14be0b787cfabbe21fc1961381cb7

5 years agogatt_utils_white_list -> connection_manager
Jakub Pawlowski [Fri, 9 Nov 2018 23:01:02 +0000 (15:01 -0800)]
gatt_utils_white_list -> connection_manager
am: ddba8a6243

Change-Id: I8000a7a5121c61270a7ea6cb24b48cec5ee1f09d

5 years agoNaming cleanup in stack/gatt/connection_manager.*
Jakub Pawlowski [Fri, 9 Nov 2018 11:42:32 +0000 (12:42 +0100)]
Naming cleanup in stack/gatt/connection_manager.*

Test: compilation
Change-Id: Ic73632cb258515856b9ae5616ec47881b4b28c61

5 years agogatt_utils_white_list -> connection_manager
Jakub Pawlowski [Fri, 9 Nov 2018 10:53:11 +0000 (11:53 +0100)]
gatt_utils_white_list -> connection_manager

Test: compilation
Change-Id: Ib6741ddd8332ff70efd47a8ede0176d887743ff4

5 years agoMerge "AVRCP: Change notification variable when the interim response is sent"
Ajay Panicker [Fri, 9 Nov 2018 03:06:59 +0000 (19:06 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent"
am: 62cd940292

Change-Id: I11061ce6fb36be8cac793ad93cd0d502eed9734d

5 years agoMerge "AVRCP: Change notification variable when the interim response is sent"
Treehugger Robot [Fri, 9 Nov 2018 02:57:12 +0000 (02:57 +0000)]
Merge "AVRCP: Change notification variable when the interim response is sent"

5 years agoAVRCP: Change notification variable when the interim response is sent
Ajay Panicker [Tue, 26 Jun 2018 21:52:56 +0000 (14:52 -0700)]
AVRCP: Change notification variable when the interim response is sent

This avoids the possibility of having a changed notification be sent
before an interim response is sent when the AVRCP service has to wait
for a response from the media layer for information regarding the
notification.

Also fix the PlayPosition test for AVRCP as it was testing for play
state correctness.

Bug: 109588762
Test: Run host test net_test_avrcp
Change-Id: Icb7bb1068191ecf2a2e390854084b6b9b47537fa
(cherry picked from commit 2d87908fe8825245dcc2e1dbde027331f1e2371d)

5 years agoMinor style fixes in gatt_main.cc
Jakub Pawlowski [Thu, 8 Nov 2018 23:25:56 +0000 (15:25 -0800)]
Minor style fixes in gatt_main.cc
am: b5629de6ed

Change-Id: I26d6290ccfe93ab38329dfb84560b8722804d57f

5 years agoMinor style fixes in gatt_main.cc
Jakub Pawlowski [Thu, 8 Nov 2018 18:54:49 +0000 (19:54 +0100)]
Minor style fixes in gatt_main.cc

Test: compilation
Change-Id: I446b9e83603e7224abe1eddd030b4502cc7dceb5

5 years agoMerge "Add code coverage report support to Bluetooth"
Ajay Panicker [Thu, 8 Nov 2018 22:18:37 +0000 (14:18 -0800)]
Merge "Add code coverage report support to Bluetooth"
am: d533096b1b

Change-Id: I4980643d5443389bb04e14fd93fdf3941a7d3b19

5 years agoMerge "Add code coverage report support to Bluetooth"
Treehugger Robot [Thu, 8 Nov 2018 22:02:48 +0000 (22:02 +0000)]
Merge "Add code coverage report support to Bluetooth"

5 years agoMerge "HFP: Don't use mSBC for HF devices not supporting related feature"
weichinweng [Thu, 8 Nov 2018 08:50:27 +0000 (00:50 -0800)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature"
am: c5931e67b4

Change-Id: Ic9969ea693f9912f12917186c921cdccdba085ab

5 years agoHFP: Send caller ID in +CLIP command (3/4)
Benson Li [Tue, 17 Jul 2018 10:05:16 +0000 (18:05 +0800)]
HFP: Send caller ID in +CLIP command (3/4)

* Append caller display name in ag_reslut data if there is name in
  CALL_STATE_INCOMING state
* Process all clip data and store the formatted string to ag_result
  data

Bug: 111378831
Test: runtest bluetooth, runtest -x BluetoothPhoneServiceTest.java
Change-Id: Ief48ed9cb5e0b32274624a90799ab9922dbd656e

5 years agoMerge "HFP: Don't use mSBC for HF devices not supporting related feature"
Treehugger Robot [Thu, 8 Nov 2018 08:43:27 +0000 (08:43 +0000)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature"

5 years agoFix Spurious Hearing Aid Start and Stop Cmds
Stanley Tng [Wed, 7 Nov 2018 23:47:05 +0000 (15:47 -0800)]
Fix Spurious Hearing Aid Start and Stop Cmds
am: ff3ed00c79

Change-Id: I14199a18d6d89385c23188e265703f5dc4d12189

5 years agoFix Spurious Hearing Aid Start and Stop Cmds
Stanley Tng [Sun, 14 Oct 2018 04:17:00 +0000 (21:17 -0700)]
Fix Spurious Hearing Aid Start and Stop Cmds

Prevent the spurious Start and Stop Commands that are send to the
Hearing Aids when there is audio suspend and resume, and also connection
and disconnections.
Also, make sure that the callback for the Audio Suspend and Resume are
done in the main thread; previously, it was running in the wrong socket
thread.
Lastly, make sure that the Connection Update callback are processed
correctly; previously, we are not checking that the right connection
interval are set and taking the callbacks done by service discovery.

Test: Manual testing with Hearing Aids
Bug: 117619792
Change-Id: I33a175947b0118f0234ec6338c20ac6e7963a598
Merged-In: I33a175947b0118f0234ec6338c20ac6e7963a598
(cherry picked from commit cac96c646fac463a9c894ad702bd4428863c9400)

5 years agoAdd code coverage report support to Bluetooth
Ajay Panicker [Thu, 20 Sep 2018 21:39:00 +0000 (14:39 -0700)]
Add code coverage report support to Bluetooth

Allow the generation of code coverage reports for any code that has
native tests.

In order to add coverage support to code do the following steps.

1. Add "clang_file_coverage" as a default to the source library(s) you
   want statistics for.
2. Add "clang_coverage_bin" as a default to the host supported test.
3. Add the test name and the files you want covered to "gen_coverage.py"
    - The files covered can either be a directory or files.
    - Avoid using / at the beginning of a covered file/dir as this
      breaks how the coverage generator resolves filenames.

Bug: 114751344
Test: run ./gen_coverage.py and test arguments manually
Change-Id: I9dd04f6ee2fd642531e301e3bfd52713f862cd4b

5 years agoCleanup LE White List HCI interface
Jakub Pawlowski [Fri, 2 Nov 2018 13:16:26 +0000 (06:16 -0700)]
Cleanup LE White List HCI interface
am: 553e88bd1f

Change-Id: I08c7e027598302105e585971de127aed5ee6bd86

5 years agoCleanup LE White List HCI interface
Jakub Pawlowski [Tue, 30 Oct 2018 21:49:30 +0000 (22:49 +0100)]
Cleanup LE White List HCI interface

Replace global functions with callbacks, to reduce interface size.

Test: add/remove at least two devices in whitelist, verify HCI snoop log
Bug: 112827989
Change-Id: Id05c9f4970bbb795309a3a233f83559bcc1c56e2

5 years agoMerge "HFP: support pause character "Comma" in acceptable dial digit string"
jonerlin [Thu, 1 Nov 2018 06:21:56 +0000 (23:21 -0700)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string"
am: 33c4b665b2

Change-Id: I28a7fe3aff8da888aa26b89047babd7d6047ec35

5 years agoMerge "HFP: support pause character "Comma" in acceptable dial digit string"
Treehugger Robot [Thu, 1 Nov 2018 06:07:45 +0000 (06:07 +0000)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string"

5 years agoHCI: accept OnceCallback instad of Callback
Jakub Pawlowski [Wed, 31 Oct 2018 00:05:29 +0000 (17:05 -0700)]
HCI: accept OnceCallback instad of Callback
am: c74471dcac

Change-Id: Ic0d01c5864fe714d89887bdb9e9efd5700ec80bb

5 years agoHFP: Don't use mSBC for HF devices not supporting related feature
weichinweng [Wed, 17 Oct 2018 07:28:56 +0000 (15:28 +0800)]
HFP: Don't use mSBC for HF devices not supporting related feature

* Some misbehaving HF devices indicate their support some mSBC related
feature but some feature is not support. It will cause some unexpected
behavior.
* This CL adds a workround for checking if HF device indicate which one
is not support on Transparent Synchronous Data, WBS and Codec
Negotiation, Fluoride will assume CVSD codec by default.

Bug: 116082185
Test: make, connect SCO and check voice on carkit and headset.
Change-Id: Ic2209e514999958061bc7db7ab18d6e5b3976758

5 years agoHCI: accept OnceCallback instad of Callback
Jakub Pawlowski [Tue, 30 Oct 2018 17:29:36 +0000 (18:29 +0100)]
HCI: accept OnceCallback instad of Callback

Command complete is guaranteed to happen only once by HCI spec.

Test: run sl4a tests around advertising, which use callback
Change-Id: I3c40ed21c56b41649bbc9519d280339b1cbb285f

5 years agoMerge changes Ie4f783b0,I456a18c6,I8c57dd5a
Jakub Pawlowski [Tue, 30 Oct 2018 07:00:05 +0000 (00:00 -0700)]
Merge changes Ie4f783b0,I456a18c6,I8c57dd5a
am: 90fd7638eb

Change-Id: I4d7b6140e50db7acbcc782c2a985cd5acaec7d9f

5 years agoMerge changes Ie4f783b0,I456a18c6,I8c57dd5a
Treehugger Robot [Tue, 30 Oct 2018 06:41:08 +0000 (06:41 +0000)]
Merge changes Ie4f783b0,I456a18c6,I8c57dd5a

* changes:
  Small cleanup in GATT white list
  Separate GATT white list from global GATT control block.
  Move white list specific code in GATT to separate file

5 years agoHFP: support pause character "Comma" in acceptable dial digit string
jonerlin [Tue, 30 Oct 2018 06:09:41 +0000 (14:09 +0800)]
HFP: support pause character "Comma" in acceptable dial digit string

* To avoid bt stack filter MO call initiated from HF end with by sending dial command with modifier character "," (Comma)

Bug: 118401445
Test: making MO call from carkit/equipment by sending ATD command with phone number plus comma plus DTMF digitals
Change-Id: I5acb913a3c034f10ad704c1b8466634df122b580

5 years agoMerge "Hearing Aid: Combine audio from stereo to mono when only one side connect"
Weichin Weng [Tue, 30 Oct 2018 02:35:37 +0000 (19:35 -0700)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect"
am: 39ac817b2c

Change-Id: Iefe6a38b484384cc3ccc02942d15da8c68ca3eee

5 years agoMerge "Hearing Aid: Combine audio from stereo to mono when only one side connect"
Weichin Weng [Tue, 30 Oct 2018 02:08:44 +0000 (02:08 +0000)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect"

5 years agoSmall cleanup in GATT white list
Jakub Pawlowski [Mon, 29 Oct 2018 14:53:35 +0000 (15:53 +0100)]
Small cleanup in GATT white list

* move local helper functions into local namespace
* reduce dependency on other modules

Bug: 112827989
Test: compilation
Change-Id: Ie4f783b00b5d0b77698412e09e35a5d11ed8f5f6

5 years agoSeparate GATT white list from global GATT control block.
Jakub Pawlowski [Mon, 29 Oct 2018 10:24:32 +0000 (11:24 +0100)]
Separate GATT white list from global GATT control block.

Bug: 112827989
Test: compilation, no functional changes
Change-Id: I456a18c6ce567991c4768afaaa3266085a9d30fb

5 years agoMove white list specific code in GATT to separate file
Jakub Pawlowski [Mon, 29 Oct 2018 09:17:23 +0000 (10:17 +0100)]
Move white list specific code in GATT to separate file

Test: compilation, no functional change
Bug: 112827989
Change-Id: I8c57dd5a3b0d6c088acc1a40d9f3437428a8bd8b

5 years agoBTM_BleClearBgConnDev -> BTM_WhiteListClear
Jakub Pawlowski [Fri, 26 Oct 2018 22:23:56 +0000 (15:23 -0700)]
BTM_BleClearBgConnDev -> BTM_WhiteListClear
am: 2b48d178f4

Change-Id: I8c6ed94643dbc683805cd0651fa6bf9f3fb8ae13

5 years agoBTM_BleClearBgConnDev -> BTM_WhiteListClear
Jakub Pawlowski [Fri, 26 Oct 2018 10:31:41 +0000 (12:31 +0200)]
BTM_BleClearBgConnDev -> BTM_WhiteListClear

BTM_WhiteList* functions are called only from gatt_utils.cc.
BTM_BleClearBgConnDev is currently an exception - instead of being
called from there, it does call gatt_reset_bgdev_list. This patch fixes
that.

Test: compilation, no functional change
Bug: 112827989
Change-Id: I4cd5bfee44c46d2ef37912496cd6cf5298ab1dfc

5 years agoSplit BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove
Jakub Pawlowski [Fri, 26 Oct 2018 18:00:58 +0000 (11:00 -0700)]
Split BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove
am: 4f688287f3

Change-Id: I63993dcc85a8278d9de76dd5d7d0a8d4514f5508

5 years agoSplit BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove
Jakub Pawlowski [Fri, 26 Oct 2018 09:29:56 +0000 (11:29 +0200)]
Split BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove

There is very little common code between both codepath. Having them
separate makes the code cleaner.

Test: compilation, no functional changes.
Bug: 112827989
Change-Id: I936f69a93366d3230df4435fc4b24962cc0bd4b2

5 years agoLinux build fix
Jakub Pawlowski [Fri, 26 Oct 2018 10:34:47 +0000 (03:34 -0700)]
Linux build fix
am: c8dcd258c1

Change-Id: I63200c093331a8e47bce90d8fb84c4675872b305

5 years agoLinux build fix
Jakub Pawlowski [Thu, 25 Oct 2018 13:12:43 +0000 (15:12 +0200)]
Linux build fix

Move metrics_linux.cc into common/, where the metrics live now.
Add btif_avrcp_audio_track_linux.cc
Fix BUILD.gn files.
Define FALLTHROUGH_INTENDED for linux, to fix build error.

Test: build with ninja and run on linux
Change-Id: I117d19ed25828389c385f09ad731e8bd61b38030

5 years agoHearing Aid: Combine audio from stereo to mono when only one side connect
weichinweng [Fri, 26 Oct 2018 09:21:13 +0000 (17:21 +0800)]
Hearing Aid: Combine audio from stereo to mono when only one side connect

* On the design of the Hearing Aids, the phone will separate the stereo
audio samples and stream the left audio samples to the left device and
right audio samples to the right device. When only one side connected,
phone will only stream the one side audio sample to one hearing aid
device.
* This CL adds a functionality for checking the left/right hearing aid
and combine audio samples from stereo to mono when only on side connect.

Bug: 117178490
Test: disconnected/reconnected one side hearing when play stereo test
sound.

Change-Id: Idb3871951617680aba3ca82f801a70c95403d889

5 years agoMinor style fixes in gatt_api.cc
Jakub Pawlowski [Fri, 26 Oct 2018 07:11:37 +0000 (00:11 -0700)]
Minor style fixes in gatt_api.cc
am: 0f79e35069

Change-Id: I7201098e67aac2bd1dd4bde265e7901c24d3a8ed

5 years agoMinor style fixes in gatt_api.cc
Jakub Pawlowski [Thu, 25 Oct 2018 22:23:21 +0000 (00:23 +0200)]
Minor style fixes in gatt_api.cc

Test: compilation
Change-Id: I3050d84443149a5ed77ab1e07f079553546b628c

5 years agoMerge "Add siyuanh@google.com to OWNERS"
Jack He [Fri, 26 Oct 2018 01:32:37 +0000 (18:32 -0700)]
Merge "Add siyuanh@google.com to OWNERS"
am: 2ceaa8c9e3

Change-Id: I3b83f3aea640b021585f963a10ae7d195091ce9e

5 years agoMerge "Add siyuanh@google.com to OWNERS"
Treehugger Robot [Fri, 26 Oct 2018 01:16:15 +0000 (01:16 +0000)]
Merge "Add siyuanh@google.com to OWNERS"

5 years agoSplit gatt_update_auto_connect_dev into separate add/remove functions
Jakub Pawlowski [Fri, 26 Oct 2018 00:47:11 +0000 (17:47 -0700)]
Split gatt_update_auto_connect_dev into separate add/remove functions
am: 80c28c6eda

Change-Id: I1b6f1529dd664239ff79ae531dfa96fbe4055e4f

5 years agoSplit gatt_update_auto_connect_dev into separate add/remove functions
Jakub Pawlowski [Thu, 25 Oct 2018 21:04:14 +0000 (23:04 +0200)]
Split gatt_update_auto_connect_dev into separate add/remove functions

Test: compilation, no functional changes
Change-Id: I58b5d565753e0c1b99a3b06b27074b593f3b903b

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 22:53:09 +0000 (15:53 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 969a599faa  -s ours

Change-Id: I6a4842e74bcb350096cea09321fb25cf79364ab7

5 years agoMerge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 21:48:45 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Id9d96121fb33dba3b75b2b5364da997e30006b36

5 years agoAdd siyuanh@google.com to OWNERS
Jack He [Tue, 17 Oct 2017 17:40:38 +0000 (10:40 -0700)]
Add siyuanh@google.com to OWNERS

Test: N/A
Change-Id: I8bdb6e7be8261a25f7ff103a5043001fa7645fee

5 years agoMerge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn"
Jakub Pawlowski [Wed, 24 Oct 2018 16:47:14 +0000 (09:47 -0700)]
Merge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn"
am: da21153044

Change-Id: Id4b539dc8932c5e1eed5af590f393345984e3a93

5 years agoMerge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn"
Jakub Pawlowski [Wed, 24 Oct 2018 16:33:59 +0000 (16:33 +0000)]
Merge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn"

5 years agoMerge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 16:08:39 +0000 (09:08 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I79403acee1a20f77cd6161d2bad1459bf4af71bb

5 years agoseparate btm_ble_stop_auto_conn from btm_ble_start_auto_conn
Jakub Pawlowski [Wed, 24 Oct 2018 11:22:40 +0000 (13:22 +0200)]
separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn

There is no common code in those two code paths. Also, minor if/else
refactoring to simplify the code.

Test: compilation, no change in how code works.
Change-Id: I82a03a18041bb5ad396f21ed13e8047e093f2765

5 years agoservice: don't use android::String16 in platform-independent code
Jakub Pawlowski [Wed, 24 Oct 2018 07:04:51 +0000 (00:04 -0700)]
service: don't use android::String16 in platform-independent code
am: 7b00a3b645

Change-Id: Ib5846ed35cc0818aa6724685203888b7fd9496aa

5 years agoservice: don't use android::String16 in platform-independent code
Jakub Pawlowski [Tue, 23 Oct 2018 19:54:53 +0000 (21:54 +0200)]
service: don't use android::String16 in platform-independent code

Test: compile on linux with ninja
Change-Id: Iac421b43a5516418a33b8c804cfca4c777363b27

5 years agoAllow implicit-fallthrough warnings locally.
Chih-Hung Hsieh [Tue, 23 Oct 2018 21:58:28 +0000 (14:58 -0700)]
Allow implicit-fallthrough warnings locally.
am: c1ae0ab3c5

Change-Id: I091127b9297fd5b0518219805b69a5994b97d660

5 years agoAllow implicit-fallthrough warnings locally.
Chih-Hung Hsieh [Tue, 16 Oct 2018 17:18:13 +0000 (10:18 -0700)]
Allow implicit-fallthrough warnings locally.

It will be a global error by default.
These warnings will be fixed in new refactored code.

Bug: 112564944
Bug: 116020782
Test: make checkbuild
Change-Id: I67f1170f3f7502a4243d8a5641eb471317b42cf4
Exempt-From-Owner-Approval: do not block on new warnings

5 years agoFix errors around logging when compiling on Linux
Jakub Pawlowski [Tue, 23 Oct 2018 17:21:01 +0000 (10:21 -0700)]
Fix errors around logging when compiling on Linux
am: e4f1378d34

Change-Id: I88127a850a6eaa9cf8a390964cf89d7839d37ad8

5 years agoFix errors around logging when compiling on Linux
Jakub Pawlowski [Tue, 23 Oct 2018 12:46:24 +0000 (14:46 +0200)]
Fix errors around logging when compiling on Linux

* cutils/log.h -> log/log.h
* add missing #include "log/log.h"
* add android_errorWriteWithInfoLog stub

Test: compile on linux using ninja
Change-Id: I720921a2fbf86b5ce5e2a2f691f1e769c91672b6

5 years agoPartial fix for linux build
Jakub Pawlowski [Tue, 23 Oct 2018 14:23:18 +0000 (07:23 -0700)]
Partial fix for linux build
am: 292ab25ef1

Change-Id: I73f01e952a85b945356627c40ac941bef31bc2cc

5 years agoPartial fix for linux build
Jakub Pawlowski [Tue, 23 Oct 2018 13:57:20 +0000 (15:57 +0200)]
Partial fix for linux build

Test: build with ninja on Linux
Change-Id: Ibb5bdde117732556b5b7f0fa6fba8a57c2912782

5 years agoMerge pi-dr1-dev to aosp-master
Bill Yi [Fri, 19 Oct 2018 21:52:03 +0000 (14:52 -0700)]
Merge pi-dr1-dev to aosp-master
am: 7a2346f7a9

Change-Id: I3f4ec71151ebc9d388a546e03428261e0d00a70c

5 years agoMerge pi-dr1-dev to aosp-master
Bill Yi [Fri, 19 Oct 2018 19:20:55 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master

Change-Id: I1670051cca44a5a490b42d07ae9977b01ce093e1

5 years agoMerge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
wangfukai [Fri, 19 Oct 2018 06:44:53 +0000 (23:44 -0700)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
am: a8f9164a7a

Change-Id: Idcf88f8245cda75a590a5877243eb46dc7af2504

5 years agoFix typo in avdt_scb_by_hdl
wangfukai [Fri, 19 Oct 2018 06:30:38 +0000 (23:30 -0700)]
Fix typo in avdt_scb_by_hdl
am: da8fdc5ad3

Change-Id: Ic9a3d2893927387011db15d1c38ee95eaf4862f8

5 years agoMerge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
Treehugger Robot [Fri, 19 Oct 2018 03:04:30 +0000 (03:04 +0000)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"

5 years agoFix typo in avdt_scb_by_hdl
wangfukai [Wed, 17 Oct 2018 06:23:12 +0000 (14:23 +0800)]
Fix typo in avdt_scb_by_hdl

Change-Id: I15ecac0232bfeb6c97f802c79bebc7aca03ab874
Signed-off-by: wangfukai <wangfukai@huawei.com>
5 years agoAVRCP:Update lidx when ACP handle exist in bta_av_rc_create
wangfukai [Mon, 15 Oct 2018 13:05:18 +0000 (21:05 +0800)]
AVRCP:Update lidx when ACP handle exist in bta_av_rc_create

Test:Pair smartphone with band and carkit, unpair band and check
Media Audio with carkit on smartphone.
Signed-off-by: wangfukai <wangfukai@huawei.com>
Change-Id: Ib913d2d52e25266e797eb896f99db593531442a7

5 years agoUprev libchrome to r576279 (1/multiple)
Jakub Pawlowski [Mon, 15 Oct 2018 09:02:11 +0000 (02:02 -0700)]
Uprev libchrome to r576279 (1/multiple)
am: 67f5f3725b

Change-Id: I54fea12bed8943b15bd4940950e5fd000bbe3963

5 years agoUprev libchrome to r576279 (1/multiple)
Jakub Pawlowski [Mon, 23 Jul 2018 17:00:25 +0000 (10:00 -0700)]
Uprev libchrome to r576279 (1/multiple)

This patch brings the latest and greatest features of libchrome to
android. It contains ~2600 patches.
Reason for uprev: libbluetooth want to use some of the most recent
features avaliable.

Test: libchrome_test
Change-Id: I5f8d5931b404767d3b86cb3bd8df2a05dd67a768
Merged-In: I5f8d5931b404767d3b86cb3bd8df2a05dd67a768

5 years agoUse proper naming for Identity Address
Jakub Pawlowski [Fri, 12 Oct 2018 19:42:41 +0000 (12:42 -0700)]
Use proper naming for Identity Address
am: 8b64778bb9

Change-Id: Ib779f549b06b39227d56d3a0e2dfb37bf76c97d7

5 years agoUse proper naming for Identity Address
Jakub Pawlowski [Fri, 12 Oct 2018 14:10:08 +0000 (16:10 +0200)]
Use proper naming for Identity Address

During Bonding, devices exchange "Identity Address Information", which
include Identity Address, and Identity Address Type.

Identity Address is either Public Address, or Static Random Address.

Thorugh stack, we improperly use "static" where we should use
"identity" to refer to this address.

Bug: 109827460
Test: compilation, just renamed variables.
Change-Id: Iccee1e8ae881e9b9f480e0bf05eea440a905109a

5 years agoMerge "Hearing Aid: Use valid COC service id"
Hansong Zhang [Fri, 12 Oct 2018 17:16:55 +0000 (10:16 -0700)]
Merge "Hearing Aid: Use valid COC service id"
am: f1db18e858

Change-Id: I1003b0240b81909eb6c7225b247d691795a28a6c

5 years agoMerge "Hearing Aid: Use valid COC service id"
Treehugger Robot [Fri, 12 Oct 2018 17:04:56 +0000 (17:04 +0000)]
Merge "Hearing Aid: Use valid COC service id"

5 years agoMerge "Add bluetooth_test_common to TEST_MAPPING"
Hansong Zhang [Fri, 12 Oct 2018 03:45:11 +0000 (20:45 -0700)]
Merge "Add bluetooth_test_common to TEST_MAPPING"
am: 6b5f3d96cc

Change-Id: Ia6f3e4f5dbc311a8dcb376c5c004a7f7a02580ba