Commit Graph

840 Commits

Author SHA1 Message Date
Jakub Pawlowski
45487910b4 Merge "Expose connection update callback (4/4)"
am: 60865e4a8d

Change-Id: I0f5301b195b697743d1fb552dac4af8e1fd1445c
2017-03-24 20:36:30 +00:00
Jakub Pawlowski
326f7b31b9 Expose connection update callback (4/4)
Test: manual
Bug: 30622771
Change-Id: I56a3c42814249abc33e95e84ce092c2d8df65434
2017-03-24 17:22:54 +00:00
Jakub Pawlowski
cde107da6c Merge "Bluetooth 5 Enable->Enabled (1/2)"
am: fa69eeac5c

Change-Id: Ia09cf5db2f69659a3b77e4c5e663d5977793df48
2017-03-23 01:25:31 +00:00
Jakub Pawlowski
2a32d04a24 Merge "BluetoothGattCallbackExt removal"
am: e2ddacaff4

Change-Id: I59ba6c9950997ea447a5b021d509a72abc546661
2017-03-23 00:44:06 +00:00
Jakub Pawlowski
7998be9e44 Bluetooth 5 Enable->Enabled (1/2)
Test: manual
Bug: 30622771
Change-Id: I37b198927076a0267de67e1bd94eaea9e88e53bb
2017-03-22 15:42:53 -07:00
Jakub Pawlowski
d64bb883d8 BluetoothGattCallbackExt removal
New methods should be added to BluetoothGattCallback, instead of
creating Ext class.

Test: manual
Bug: 30622771
Change-Id: I2567df5baace6bd2d2f30c36d2f62056408ca5d0
2017-03-22 18:27:10 +00:00
Jakub Pawlowski
8d06b41826 Merge "Add setScannable to AdvertisingSetParameters (1/2)"
am: 7f14b8f095

Change-Id: I26846383be5c0fe88501ffd1011b27f39896a74a
2017-03-21 18:44:36 +00:00
Jakub Pawlowski
43f71975d0 Merge "Add missing txPower parameter"
am: a6c1f6def1

Change-Id: I61ac50f7f2a5d3d3ea2a3e23b441fa22bb69f52a
2017-03-21 18:43:21 +00:00
Jakub Pawlowski
d12b5688f0 Add setScannable to AdvertisingSetParameters (1/2)
There must be a proper way to specify if advertisment is scannable, when
updating the parameters.

Test: manual
Bug: 30622771
Change-Id: Ie520609d3fff07ccc2960015c19311d773842852
2017-03-21 18:37:16 +00:00
Jakub Pawlowski
bcf671b7eb Add missing txPower parameter
Test: manual
Bug: 30622771
Change-Id: Iaf3111d7545f9bb046b5a23b680347a75125ca7e
2017-03-21 18:36:05 +00:00
Jakub Pawlowski
375741e99a Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am: f0c963a5b6

Change-Id: Ia401ccf8935b8cb315849803c5c82d1d7dd64b81
2017-03-20 22:26:42 +00:00
Jakub Pawlowski
6a55da9018 Bluetooth 5 AdvertisingSet implementation (1/4)
Test: manual
Bug: 30622771
Change-Id: Ia89718c0c2ab2eaa71b158ecdcae989af907769f
2017-03-20 20:00:36 +00:00
Jakub Pawlowski
07d79aa3b0 Merge "Bluetooth 5 move timeout parameter (1/2)"
am: d9f2f67a5f

Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543
2017-03-17 22:34:24 +00:00
Jakub Pawlowski
adbf2eef2f Bluetooth 5 move timeout parameter (1/2)
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.

Test: manual
Bug: 30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde
2017-03-17 22:23:57 +00:00
Jakub Pawlowski
2fc3834f4d Merge "LE Maximum Advertising Data Length (1/4)"
am: 74f2e1a303

Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a
2017-03-17 05:19:57 +00:00
Jakub Pawlowski
ad10affa4e LE Maximum Advertising Data Length (1/4)
Add ability to check maximum advertising data length.

Bug: 30622771
Test: manual
Change-Id: I281f7e9f294c40a47a67a22809cc753b6693f7c4
2017-03-16 18:27:01 -07:00
Jakub Pawlowski
45e0c6ea7f Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am: 15e69df921

Change-Id: I585fc900b4a153744116fa87764db98b038184d5
2017-03-17 01:09:02 +00:00
Jakub Pawlowski
5f00f173fb Bluetooth 5 AdvertisingSet implementation (1/4)
This patch wires up fist methods of AdvertisingSet, making it possible
to start advertising and stop advertising. It also replaces legacy
implemementation with calls to new implementation.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I80a4b1b2b632d5ef8a80d958615897684cfa0c16
2017-03-16 22:17:09 +00:00
Jakub Pawlowski
58569de4de Merge "Bluetooth 5 spelling fixes"
am: 5465fe0a2d

Change-Id: Ibef8ee6a56bf1f8c695e07e4ba61c015054eee13
2017-03-13 18:11:58 +00:00
Jakub Pawlowski
bc2991e866 Bluetooth 5 spelling fixes
Bug: 30622771
Test: manual
Change-Id: I46b6486619cc7366e56b25ca48937e6792f53e1d
(cherry picked from commit 53501ad210)
2017-03-13 17:48:42 +00:00
Jakub Pawlowski
fc3c9d0e9e Merge "Bluetooth 5 Advertising API"
am: 1bb08c25b8

Change-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd
2017-03-08 19:21:03 +00:00
Jakub Pawlowski
4f6034160c Merge "Bluetooth 5 PHY selection API"
am: 104eeedb42

Change-Id: I0ee2daaf0771b405c8a14598a70459879d31c953
2017-03-08 19:18:50 +00:00
Jakub Pawlowski
8acd7391bd Merge "Bluetooth 5 periodc scan API (1/2)"
am: f1d76a71c8

Change-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16
2017-03-08 19:14:22 +00:00
Jakub Pawlowski
71760b71fd Merge "Bluetooth 5 enhanced scanning API"
am: bed6fb3f5a

Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411
2017-03-08 19:12:08 +00:00
Jakub Pawlowski
e9bd9be3cb Merge "Bluetooth 5 feature check API (1/2)"
am: a06a0dfdb7

Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df
2017-03-08 19:09:43 +00:00
Jakub Pawlowski
a9d1a32e5e Bluetooth 5 Advertising API
Test: manual
Bug: 30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit 5324a14cf4)
2017-03-08 19:04:49 +00:00
Jakub Pawlowski
409cee69b2 Bluetooth 5 PHY selection API
Bug: 30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit db5a87d50d)
2017-03-08 19:04:06 +00:00
Jakub Pawlowski
ac7fcfa361 Bluetooth 5 periodc scan API (1/2)
Bug: 30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
(cherry picked from commit a48e03745b)
2017-03-08 19:03:12 +00:00
Jakub Pawlowski
3aca933861 Bluetooth 5 enhanced scanning API
Bug: 30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
(cherry picked from commit 9de522c6e4)
2017-03-08 19:02:25 +00:00
Jakub Pawlowski
48091bbd78 Bluetooth 5 feature check API (1/2)
Bug: 30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
(cherry picked from commit 79d66495c3)
2017-03-08 18:20:03 +00:00
Hemant Gupta
12358b4057 Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
am: 79eb213a98

Change-Id: I5f82a0c40c64fca0701abba44693b2892209acf3
2017-03-08 00:38:14 +00:00
Hemant Gupta
ef3e0dbf00 Bluetooth: Expose L2CAP API to support OPP 1.2
Add changes to expose L2CAP API to create an insecure L2CAP socket
for supporting OPP 1.2.

Test: Connect with Remote OPP Client supporting OPP 1.2 and verify
that connection and transfer happens over L2CAP. Connect with Remote
OPP Client supporting OPP 1.1 and verify that connection and transfer
happens over RFCOMM.

Bug: 33010988
Change-Id: I21ed672afb4ed5d2355ff0a0f9691af220921c1f
2017-03-07 02:30:52 +00:00
Pavlin Radoslavov
b7067e2b6c Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
am: cd6e0ee19d

Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
2017-02-07 00:10:21 +00:00
Pavlin Radoslavov
2199339c39 Add a mechanism to configure the default A2DP codec priorities
Previously, the relative codec priorities were hard-codec internally.
The new mechanism uses the following configurable resources in
packages/apps/Bluetooth/res/values/config.xml to re-assign the
default codec priorities per device, or to explicitly disable a codec.

 - a2dp_source_codec_priority_sbc
 - a2dp_source_codec_priority_aac
 - a2dp_source_codec_priority_aptx
 - a2dp_source_codec_priority_aptx_hd
 - a2dp_source_codec_priority_ldac

Those values are assigned on startup.
Also, they can be changed per device by using an overlay:
device/<VENDOR>/<DEVICE>/overlay/packages/apps/Bluetooth/res/values/config.xml

Test: Manually streaming to a headset
Change-Id: Ic4da3a51ac73f00cbae731156cb7878c8fadee06
2017-02-06 13:07:23 -08:00
Pavlin Radoslavov
91707989c4 Merge "Update the A2DP Codec Config API" am: ccd60f7cbe
am: f0096fb868

Change-Id: Ibc7d4b500adc4451978f366557b93dc6b6d3da63
2017-01-31 19:13:05 +00:00
Pavlin Radoslavov
b37f181c98 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, refactored the Java internals to accomodate the extra information:
 * Added new class BluetoothCodecStatus that contains the extra info:
   current codec config, local codecs capabilities and selectable
   codecs capabilities
 * Renamed method getCodecConfig() to getCodecStatus() and return the
   corresponding BluetoothCodecStatus object.
 * Updates to class BluetoothCodecConfig:
   new methods isValid(), getCodecName(), and updated toString()
   so it is more user friendly
 * Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
   EXTRA_PREVIOUS_CODEC_CONFIG.
   The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
   the latter is not really used.

Test: A2DP streaming with headsets and switching the codecs
Change-Id: Ia1af2c22e521e863e28a360610aca49f7e62d31b
2017-01-31 18:58:27 +00:00
Marie Janssen
ca312c1cd3 Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea
am: 7f8d8638eb

Change-Id: I6f02c4ddc0fe56cda5af2dcf2f5193ba13522792
2017-01-30 17:57:02 +00:00
Marie Janssen
23a4833157 Bluetooth: add getDiscoveryEndMillis() call
Method to tell when the adapter finished (or will finish) being in
discovery mode.

Test: compiles and still can scan
Bug: 34395439
Change-Id: I41b48c2b934c0a1d5e1727cec08f3f762e3cb309
2017-01-27 18:48:11 -08:00
Pavlin Radoslavov
d364208388 Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb
am: f23e80bb9b

Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062
2017-01-26 19:25:37 +00:00
Pavlin Radoslavov
b33bd5bc2e Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: I1b530f1c5c495b8231fd68bed788d4567096683d
2017-01-26 09:06:02 -08:00
Sanket Agarwal
c8399321e9 Change HFP Client API to support multi device
- Adds BluetoothDevice as a parameter where required
- Gets rid of device management APIs that can be done via
  BluetoothProfiles instead

Test: Manual sanity tests
Bug: b/33554547
Bug: b/30984220
Change-Id: I3485ac5bfe1fcb29c774ad040fdd608e1cacb8df
(cherry picked from commit 039eeb81b5)
2017-01-23 22:53:58 +00:00
Sanket Agarwal
a3ae5c4e24 Change HFP Client API to support multi device
- Adds BluetoothDevice as a parameter where required
- Gets rid of device management APIs that can be done via
  BluetoothProfiles instead

Test: Manual sanity tests
Bug: b/33554547
Bug: b/30984220
Change-Id: I3485ac5bfe1fcb29c774ad040fdd608e1cacb8df
(cherry picked from commit 039eeb81b5)
2017-01-20 19:30:35 -08:00
Neil Fuller
43d53395dc Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
am: f4e236c794

Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14
2017-01-11 13:48:14 +00:00
Neil Fuller
7fd724611b Refactor RFCOMM / BluetoothSocket usage of LocalSocket
LocalSocket is used by BluetoothSocket. BluetoothSocket
passes a pre-created file descriptor to LocalSocket that
is then given to the LocalSocketImpl.

Commit b08c7bc0bd broke the
behavior. Commit 7a8c36aa4e
put in a minimal fix.

This change tidies up LocalSocket and associated classes
and replaces a specialist constructor with a factory method
to highlight the special case. While there an unnecessary
exception has been removed.

Bug: 34111534
Test: Boot device
Test: vogar --mode app_process tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I4ba2f2d9ea361a950ff8bc8d64fc800d998c3210
2017-01-06 14:18:07 +00:00
Pavlin Radoslavov
7d14914239 Merge "Integration of the LDAC codec for A2DP source" am: 3c050268f0
am: bb8f1cd92b

Change-Id: I62f8462330d7661b8008abf862c4d4bb47c129dc
2017-01-05 07:55:27 +00:00
Pavlin Radoslavov
fad8b730d2 Integration of the LDAC codec for A2DP source
The codec can be used if the encoding shared library is installed
on the device:
 libldacBT_enc.so

Test: A2DP streaming to LDAC headsets
Bug: 30958229

Change-Id: I524805fd308b5181427515617eda05625a7c4ae5
2017-01-04 18:07:29 -08:00
Pavlin Radoslavov
5aaa985e97 Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b
am: a750c90ac1

Change-Id: I7957fb151bb113485240fdc2bae1cdd380930f27
2017-01-05 02:07:05 +00:00
Pavlin Radoslavov
feeb9b245c Integration of the aptX and aptX-HD codecs for A2DP source
Each of the codecs can be used if the corresponding encoding
shared library is installed on the device:
 - aptX: libaptX.so
 - aptX-HD: libaptXHD.so

Test: A2DP streaming to aptX and aptX-HD headsets
Bug: 30958229
Change-Id: I24faddc8cd88ae3e1370922c633f30e13124a867
2017-01-04 16:30:35 -08:00
Ivan Podogov
8e2e2b1381 Merge "HID Device role API fixes" am: f33a71d017
am: a7d58fecc6

Change-Id: Iab0dc91a8e2d4066d5eb85ec4771d42642783671
2017-01-04 10:41:26 +00:00
Ivan Podogov
f33a71d017 Merge "HID Device role API fixes" 2017-01-04 10:32:41 +00:00