Hansong Zhang
57365515d5
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c am: 64d81fbf33
...
am: 9c6044771f
2017-12-12 19:35:42 +00:00
Hansong Zhang
9c6044771f
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c
...
am: 64d81fbf33
2017-12-12 19:22:12 +00:00
Hansong Zhang
fef6d81156
Make BluetoothPbap implement BluetoothProfile (1/3)
...
* BluetoothPbap will implement BluetoothProfile to be consistent with
other profiles
* Changed the method names to match the BluetoothProfile method
signatures
* Removed doesClassMatchSink() as it is never used
* Disable default DEBUG logs
Test: test with carkits
Bug: 69417672
Change-Id: I0766188f77468808d7505780c781f5fd8608af60
2017-12-11 13:36:45 -08:00
Jakub Pawlowski
4609285e29
Fix bad type for txPower in PeriodicAdvertisingReport serialization
...
Bug: 69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
2017-12-08 18:19:29 +00:00
Jack He
deb9bd0544
Merge "BT: Remove dead code in BluetoothHeadset" am: ea7363402c am: 38ae4d2fce
...
am: aa9829a85a
2017-12-08 04:03:52 +00:00
Hansong Zhang
003945515c
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()" am: 0d3990b235 am: c2205a8d3d
...
am: 3c84b37f80
2017-12-08 02:51:25 +00:00
Jack He
aa9829a85a
Merge "BT: Remove dead code in BluetoothHeadset" am: ea7363402c
...
am: 38ae4d2fce
2017-12-08 01:48:22 +00:00
Treehugger Robot
ea7363402c
Merge "BT: Remove dead code in BluetoothHeadset"
2017-12-08 01:14:59 +00:00
Hansong Zhang
3c84b37f80
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()" am: 0d3990b235
...
am: c2205a8d3d
2017-12-07 22:11:27 +00:00
Treehugger Robot
0d3990b235
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
2017-12-07 21:37:45 +00:00
Jack He
887e2a1e14
BT: Remove dead code in BluetoothHeadset
...
The following hidden API methods are not implemented by the stack and
should be removed:
- getBatteryUsageHint()
- acceptIncomingConnect()
- rejectIncomingConnect()
The following hidden API methods are no longer needed due to lack of
usage and should be removed:
- enableWBS()
- disableWBS()
- bindResponse()
Bug: 70336991
Test: make
Change-Id: I75bd6735573e4cbc61b5bef8722b8badac2e9170
2017-12-07 12:06:21 -08:00
Myles Watson
6f16cfb4b2
Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c am: 03e1dfa444
...
am: 158eae223d
2017-12-07 05:07:50 +00:00
Hansong Zhang
53f5412beb
Bluetooth HID Device: format code, fix docstring, hide unplug()
...
* Reformat code with google-java-format
* Add the note that When an application is registered, the HID Host service
will be disabled until it is unregistered
* Fix the links in docstring
* Add @hide to unplug(); this is not a public API
Bug: 63384609
Test: make
Change-Id: I5dfcaab58b02c19e5745461c16602064a0ad8b83
2017-12-06 16:34:15 -08:00
Xin Li
5364be50cd
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I727a014df2fb05a4b13cb67b1fcb760a8b387523
2017-12-06 14:24:49 -08:00
Hansong Zhang
739c7bb9cb
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)" am: 8ab47567b2
...
am: bee508cb6d
2017-12-06 20:50:07 +00:00
Hansong Zhang
bee508cb6d
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
...
am: 8ab47567b2
2017-12-06 20:33:29 +00:00
Myles Watson
158eae223d
Merge "Auto-format BluetoothAdapter.java" am: 5416559d1c
...
am: 03e1dfa444
2017-12-06 20:22:01 +00:00
Myles Watson
03e1dfa444
Merge "Auto-format BluetoothAdapter.java"
...
am: 5416559d1c
2017-12-06 20:04:07 +00:00
Treehugger Robot
8ab47567b2
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
2017-12-06 19:34:22 +00:00
Myles Watson
125b5456f1
Auto-format BluetoothAdapter.java
...
Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9
2017-12-06 16:42:23 +00:00
Hansong Zhang
4cbf548dcc
Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)
...
Bug: 69981563
Test: HID Device SL4A Test
Change-Id: Ifb7002bb4f3f6f29b01a3d337ab68b674d6947c9
2017-12-04 09:49:45 -08:00
Hansong Zhang
7e527b7bc5
Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)
...
Bug: 69981563
Test: HID Device SL4A Test
Change-Id: Ifb7002bb4f3f6f29b01a3d337ab68b674d6947c9
2017-11-30 16:55:37 -08:00
Hansong Zhang
899f9e9609
Merge "Bluetooth HID Device API docs and helper" am: a89f6150dc am: 7c005ea373
...
am: 55839ebbb8
2017-11-16 19:14:00 +00:00
Hansong Zhang
55839ebbb8
Merge "Bluetooth HID Device API docs and helper" am: a89f6150dc
...
am: 7c005ea373
2017-11-16 18:59:36 +00:00
Hansong Zhang
7c005ea373
Merge "Bluetooth HID Device API docs and helper"
...
am: a89f6150dc
2017-11-16 18:50:16 +00:00
Hansong Zhang
ceb84db837
Bluetooth HID Device API docs and helper
...
* Add a builder for BluetoothHidDeviceAppQosSettings
* Add documentation for BluetoothHidDeviceAppSdpSettings
and BluetoothHidDeviceAppQosSettings
* Fix the behavior of and BluetoothHidDeviceAppSdpSettings.equals()
and BluetoothHidDeviceAppQosSettings.equals()
Bug: 63384609
Test: test with HID device apps
Change-Id: I933f4ec3034e1f704ddd614e48b76d27fda8b6ff
2017-11-15 17:20:52 -08:00
Xin Li
220871a697
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
...
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Jakub Pawlowski
58de99a248
Merge "Move connectSocket into IBluetoothSocketManager (3/3)" am: 8d742759cc
...
am: 9c26701b35
2017-11-14 01:23:04 +00:00
Jakub Pawlowski
0430720a23
Move connectSocket into IBluetoothSocketManager (3/3)
...
Bug: 68359837
Test: none
Merged-In: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
2017-11-10 21:42:26 +00:00
Jakub Pawlowski
334a5a4e5f
Move connectSocket into IBluetoothSocketManager (3/3)
...
Bug: 68359837
Test: none
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
2017-11-10 11:00:42 -08:00
Jakub Pawlowski
e83cac702c
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am: 3e9b9b74b4 am: 7b38581ded
...
am: 222f4a2c81
2017-11-10 08:42:32 +00:00
Jakub Pawlowski
222f4a2c81
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am: 3e9b9b74b4
...
am: 7b38581ded
2017-11-10 08:31:40 +00:00
Jakub Pawlowski
fe7e885180
Move createSocketChannel into IBluetoothSocketManager (3/3)
...
Bug: 68359837
Test: none
Change-Id: I52b03ff3d637bf661c70279b7ca18b105157f7a2
2017-11-09 22:13:21 +00:00
Andrew Solovay
ff9216a7c9
Merge "docs: Typo fixes" into oc-mr1-dev am: ab9449561e
...
am: 54e351b3cb
2017-10-28 02:19:18 +00:00
Andrew Solovay
54e351b3cb
Merge "docs: Typo fixes" into oc-mr1-dev
...
am: ab9449561e
2017-10-28 02:01:06 +00:00
Andrew Solovay
237c189723
docs: Typo fixes
...
See first comment for doc stage location.
Change-Id: I29661ffab0ff10021671df0b725c9f9b12430960
Bug: 67886596
Bug: 67932414
Test: make ds-docs
2017-10-27 15:29:57 -07:00
Hansong Zhang
4883b34d1b
Merge "Enable HID Device Profile Service (2/2)" am: 7e3fbd59d1 am: 21bb474cc3
...
am: f5286b90ef
2017-10-27 21:53:02 +00:00
Hansong Zhang
f5286b90ef
Merge "Enable HID Device Profile Service (2/2)" am: 7e3fbd59d1
...
am: 21bb474cc3
2017-10-27 21:38:51 +00:00
Hansong Zhang
fa377b407b
Enable HID Device Profile Service (2/2)
...
Add Profile Proxy for HID Device Profile.
* Add a helper method doUnbind() to deal with unbinding to Bluetooth HID
Service.
* Fix docstrings.
Bug: 63384609
Test: SL4A Bluetooth HID test
Change-Id: I168c21c3b010baac9889c556635b914c0ba3f267
2017-10-27 16:47:39 +00:00
Pulkit Bhuwalka
16084cfc04
Merge changes from topic "bt_get_cod" am: 35dc02004c am: 178e5873b0
...
am: f7e25297ae
2017-10-24 06:47:51 +00:00
Pulkit Bhuwalka
f7e25297ae
Merge changes from topic "bt_get_cod" am: 35dc02004c
...
am: 178e5873b0
2017-10-24 06:36:52 +00:00
Pulkit Bhuwalka
a3427552fe
Merge "Persist Bluetooth CoD config value across reboot" am: ba45409c92 am: b977674b17
...
am: 7cc5e10c2f
2017-10-24 06:32:30 +00:00
Pulkit Bhuwalka
178e5873b0
Merge changes from topic "bt_get_cod"
...
am: 35dc02004c
2017-10-24 06:27:23 +00:00
Pulkit Bhuwalka
7cc5e10c2f
Merge "Persist Bluetooth CoD config value across reboot" am: ba45409c92
...
am: b977674b17
2017-10-24 06:22:08 +00:00
Pulkit Bhuwalka
b977674b17
Merge "Persist Bluetooth CoD config value across reboot"
...
am: ba45409c92
2017-10-24 06:13:48 +00:00
Pulkit Bhuwalka
d01fa6e686
Get Bluetooth Class of Device
...
Adds API to fetch Bluetooth CoD value of the stack. The API is hidden to
only be used by System code.
Bug: 36015415
Test: Verified fetching of COD from test app on flashed device, after modification
and after after reboot.
Change-Id: Ie35ecf141704c2aac46678da7cabdc7203a088f2
2017-10-23 23:11:37 -07:00
Treehugger Robot
ba45409c92
Merge "Persist Bluetooth CoD config value across reboot"
2017-10-24 06:05:45 +00:00
Hansong Zhang
5140894a5d
Merge "Change Bluetooth HID Profile Name (1/6)" am: 8218b219f3
...
am: c8a370aeba
2017-10-23 22:46:31 +00:00
Hansong Zhang
c8a370aeba
Merge "Change Bluetooth HID Profile Name (1/6)"
...
am: 8218b219f3
2017-10-23 22:33:50 +00:00
Hansong Zhang
0edf754b2d
Change Bluetooth HID Profile Name (1/6)
...
Make the Bluetooth HID profile name consistent with the Bluetooth HID service
name.
BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST
(Cherry-picked from commit c26c76c63d
2017-10-23 22:21:00 +00:00
