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
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
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
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
f7e25297ae
Merge changes from topic "bt_get_cod" am: 35dc02004c
...
am: 178e5873b0
2017-10-24 06:36:52 +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
Pulkit Bhuwalka
547853d4c3
Persist Bluetooth CoD config value across reboot
...
Create new Settings key for storage and update the API doc.
Bug: 36015415
Test: Verified by storing a value through a test app and restarting the
machine to ensure it's picked up.
Change-Id: I94aa054e525c4656bb3a824a29cae9c88f8904e0
2017-10-22 15:36:06 -07:00
Jack He
1b41112e38
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2 am: 8057ba832e
...
am: 5dfce858ea
2017-10-04 18:09:50 +00:00
Jack He
5dfce858ea
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent" am: cfe51aabd2
...
am: 8057ba832e
2017-10-04 17:42:26 +00:00
Jack He
8057ba832e
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
...
am: cfe51aabd2
2017-10-04 17:22:28 +00:00
Jack He
37ab815c96
PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
...
* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
states for PBAP profile
Bug: 63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2
2017-10-04 16:22:57 +00:00
Hansong Zhang
a51244c781
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804"
...
This reverts commit 45f17f4533
2017-10-02 22:34:23 +00:00
Hansong Zhang
185ec6d91d
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804 am: 45f17f4533"
...
This reverts commit 7c55e52d51
2017-10-02 22:33:47 +00:00
Hansong Zhang
7c55e52d51
Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804
...
am: 45f17f4533
2017-09-30 05:05:28 +00:00
Hansong Zhang
849805b804
Merge "Bluetooth HID Device: Fix a typo"
...
am: d30e47ecfc
2017-09-30 04:48:28 +00:00
Hansong Zhang
ecd09fb952
Bluetooth HID Device: Fix a typo
...
Fixed a typo in BluetoothInputHost. "DIGITIZER_TABLED" should be
"DIGITIZER_TABLET".
Test: Not needed.
Change-Id: I06ffc536f5912d53319b4d325f77991d65ab04f2
2017-09-29 20:56:00 +00:00
Pulkit Bhuwalka
252eebec97
Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab706 am: c037004fd9
...
am: 69da7a1766
2017-09-27 20:18:38 +00:00
Pulkit Bhuwalka
c037004fd9
Merge "Modify Bluetooth Class of Device from Android stack"
...
am: f4ec2ab706
2017-09-27 20:04:32 +00:00
Treehugger Robot
f4ec2ab706
Merge "Modify Bluetooth Class of Device from Android stack"
2017-09-27 19:43:17 +00:00
Pulkit Bhuwalka
66d6123880
Modify Bluetooth Class of Device from Android stack
...
Bug: 36015415
Test: Modified Class of Device using sample app and verified device icon
change when discovering from a remote device.
Change-Id: Ie25f10be5560f9c090ebe489d5f3bb00cbca81ef
2017-09-20 15:51:49 -07:00
Ruina Liu
57a1d7a669
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44 am: 8c65620d31
...
am: 311d031d22
2017-09-18 18:06:30 +00:00
Ruina Liu
8c65620d31
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
...
am: ac421b8f44
2017-09-18 17:53:31 +00:00
Ruina Liu
044e0fe5c5
Fix extracting 32-bit uuid error via calling method uuidToBytes
...
A new defined method of uuidToBytes is used to convert
Bluetooth uuid to bytes in the case of BLE advertising.
But the most significant 16 bits of a 32-bit uuid
will be cleared after the and operations with
0X0000FFFF00000000L in the function of
getServiceIdentifierFromParcelUuid.
0XFFFFFFFF00000000L should be used as bit mask.
Change-Id: I83e22ffbecd718540e644289fee12bf9c3b66305
Test: Advertise with payload contains 32-bit uuid
2017-09-15 17:08:32 -07:00
Jakub Pawlowski
4df0b1590c
Merge changes from topic "incl_svc_parsing_fix" am: fee4546fd6 am: 3aa179fabd
...
am: e22de0f23f
2017-09-15 02:38:09 +00:00
Jakub Pawlowski
3aa179fabd
Merge changes from topic "incl_svc_parsing_fix"
...
am: fee4546fd6
2017-09-14 23:36:00 +00:00
Jakub Pawlowski
618ea49ccf
Merge "Bluetooth: fix parameter name in onConnectionUpdated" am: 1f53eb76e4 am: 8ab1ed1789
...
am: dd71df9d41
2017-09-14 19:50:18 +00:00
Jakub Pawlowski
8dde5e1ce0
Fix included service parsing (3/3)
...
Bug: 65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c
2017-09-14 19:37:40 +00:00
Jakub Pawlowski
8ab1ed1789
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
...
am: 1f53eb76e4
2017-09-14 19:35:24 +00:00
Jakub Pawlowski
cf733cd020
Bluetooth: fix typo in comment
...
Test: none
Change-Id: I48c674049df88285268145d4140870eb4ab79a62
2017-09-14 19:24:28 +00:00
Jakub Pawlowski
14a381bc3e
Bluetooth: fix parameter name in onConnectionUpdated
...
Test: compilation
Change-Id: I625e4ca63477b795310ebb42ca5e9a0549523cc5
2017-09-14 19:23:59 +00:00
Jakub Pawlowski
dbc067bcc7
Merge "Bluetooth: thread-safe callback invocation" am: f8c7572b8f am: c416035448
...
am: eef8920a9f
2017-09-14 10:23:06 +00:00
Jakub Pawlowski
4eba1140f3
Merge "Bluetooth: fix GATT race conditions when using Handler" am: 06b29a87d7 am: 9054e03cf4
...
am: 79ce33fc96
2017-09-14 10:16:41 +00:00
Jakub Pawlowski
05c1578c16
Bluetooth: thread-safe callback invocation
...
Bug: 65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7
(cherry picked from commit 3eb569fc72
2017-09-14 02:37:45 +00:00
Jakub Pawlowski
93703a08c7
Bluetooth: fix GATT race conditions when using Handler
...
Bug: 65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
Merged-In: Id703cea0543626bdd5a583da95615b650bbcc331
2017-09-13 22:43:09 +00:00
Jakub Pawlowski
c416035448
Merge "Bluetooth: thread-safe callback invocation"
...
am: f8c7572b8f
2017-09-13 22:12:16 +00:00
