Jakub Pawlowski
4984d66b6a
Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 am: 6fe3900791
...
am: 56757a44a6
2016-10-06 21:12:06 +00:00
Jakub Pawlowski
56757a44a6
Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739
...
am: 6fe3900791
2016-10-06 21:07:44 +00:00
Jakub Pawlowski
0278ab957a
Fix connecting to profiles when bonding from local device (1/3)
...
When bond is created from Bluetooth Settings, profiles gets properly
auto connected when services are discovered. If pairing is done from any
other app, i.e. NFC app, the bond is not being recognized as initiated
from local device, and profiles are not connected.
This patch makes sure that if bonding is initiated, no matter from which
app, it will cause proper profiles to connect.
Bug: 30211618
Change-Id: I71131f33eb5b9db2f5b4a8737b191d541bf1fd3d
2016-10-04 17:29:37 +00:00
Jeremy Klein
8002b27512
Remove unused mContext from BluetoothGatt[Server]. am: adc26ec1b4
...
am: 140e5cce70
2016-09-28 15:44:23 +00:00
Jeremy Klein
adc26ec1b4
Remove unused mContext from BluetoothGatt[Server].
...
All that this member variable is doing right now is leaking a
reference to a context without any benefit.
Bug: 31752040
Bug: 31710795
Change-Id: If2241422533318b866340e8dcc9f5fbd9518349c
2016-09-28 07:09:38 +00:00
Ajay Panicker
e6558c2a54
Prevent NPE if someone creates a bad BluetoothHealthAppConfig object am: 74fa2d6846
...
am: 26803036be
2016-09-26 18:37:58 +00:00
Ajay Panicker
74fa2d6846
Prevent NPE if someone creates a bad BluetoothHealthAppConfig object
...
Bug: 28271086
Change-Id: Ic8ebe3152e2b06c070316acc7e6a1f89763cd2a3
2016-09-23 22:08:26 +00:00
Marie Janssen
21688f8e34
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b
...
am: dbb8ffc47d
2016-09-21 02:20:22 +00:00
Marie Janssen
dbb8ffc47d
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3
...
am: 6f514cc82b
2016-09-21 01:59:29 +00:00
Marie Janssen
5742a055e2
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3
...
am: 6f514cc82b
2016-09-21 01:32:37 +00:00
Marie Janssen
6f514cc82b
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048
...
am: 532d2b11a3
2016-09-21 01:02:29 +00:00
Marie Janssen
532d2b11a3
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27
...
am: e3812fc048
2016-09-21 00:46:01 +00:00
Marie Janssen
e3812fc048
Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f
...
am: 3106e3ae27
2016-09-21 00:37:07 +00:00
Marie Janssen
93326cfd9f
Fix setPairingConfirmation permissions issue (2/2)
...
setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.
This is restricted to BLUETOOTH_PRIVILEGED permission.
Bug: 29043989
Change-Id: I887de32d156e672ec44aa0b286cd7ea7f9f8ad55
2016-09-08 18:15:26 +00:00
Jakub Pawlowski
8348bd2317
Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242
...
am: 9f341e4e49
2016-08-31 18:28:45 +00:00
Jakub Pawlowski
9f341e4e49
Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a
...
am: 40a16ea242
2016-08-31 18:21:00 +00:00
Jakub Pawlowski
a480f7fe28
Separate advertiser from GATT client (1/4)
...
Bug: 30622771
Change-Id: I08c0498f8a1ea04423d3e864e9a60c7c78f1dbad
2016-08-31 03:36:53 -07:00
Hemal Patel
ac0b242755
resolve merge conflicts of a544221 to nyc-dev-plus-aosp
...
am: 309813c8af
2016-08-26 00:42:38 +00:00
Hemal Patel
309813c8af
resolve merge conflicts of a544221 to nyc-dev-plus-aosp
...
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02
2016-08-25 17:30:34 -07:00
Hemal Patel
d6a64d788b
Docs: Fixed the Bluetooth guide link am: 65813dff14
...
am: a544221abd
2016-08-25 21:37:59 +00:00
Hemal Patel
65813dff14
Docs: Fixed the Bluetooth guide link
...
Fixed the link that points to the Bluetooth guide.
Bug: 29268546
Change-Id: I51c48cebf45c78481f8853a93ff7bcd8483d69ba
2016-08-17 13:55:09 -07:00
Jakub Pawlowski
ecd10beefd
resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776
...
am: 84b61fb4b0
2016-08-11 23:11:19 +00:00
Jakub Pawlowski
5aa4ba3776
resolve merge conflicts of 5671277 to stage-aosp-master
...
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
2016-08-11 15:53:06 -07:00
Jakub Pawlowski
747711ce9b
Add LE Secure Connection data parsing (1/4)
...
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
2016-08-11 22:18:19 +00:00
Jakub Pawlowski
de5ad04c2b
Merge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445
...
am: 4184bab40b
2016-08-04 21:37:53 +00:00
Jakub Pawlowski
83272db445
Merge "Fix bad index usage"
...
am: 5cfe8a8315
2016-08-04 20:46:32 +00:00
Jakub Pawlowski
d167db19a9
Fix bad index usage
...
Bug: 27999121
Change-Id: Ie2ba6f71bbf6f789a3c1016ba2f0051b809ac87e
2016-08-04 20:19:52 +00:00
Mudumba Ananth
a095ee3c1d
Merge "HFP 1.7 profile update (3/4)"
...
am: f28f6bb2b0
2016-08-04 01:32:41 +00:00
Mudumba Ananth
709b11ef7a
HFP 1.7 profile update (3/4)
...
-> Android Framework changes to add support for
an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
of the supported HF indicators and their values (if received)
Bug: 19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
(cherry picked from commit 0d98ebf997
2016-08-03 17:55:04 -07:00
Jakub Pawlowski
9dd9e1a635
Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7eaf am: 0aa5797976
...
am: ed042c00e0
2016-08-04 00:19:14 +00:00
Jakub Pawlowski
0aa5797976
Merge "Remove write type from GATT descriptor writes (1/4)"
...
am: b7eb1d7eaf
2016-08-04 00:01:25 +00:00
Jakub Pawlowski
8e970d6ab4
Remove write type from GATT descriptor writes (1/4)
...
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used
for this sub-procedure".
Change-Id: I141dd24ed5911d5d485b52a1b661835b9960921a
2016-08-03 10:42:47 -07:00
Jakub Pawlowski
ca08f14d6b
Merge "GATT Server refactoring (2/4)" am: d13954e8c6 am: fe4b1e47fc
...
am: f8b8f56b73
2016-08-03 13:12:02 +00:00
Jakub Pawlowski
fe4b1e47fc
Merge "GATT Server refactoring (2/4)"
...
am: d13954e8c6
2016-08-03 12:59:24 +00:00
Jakub Pawlowski
d75f512aa2
GATT Server refactoring (2/4)
...
Bug: 27999121
Change-Id: Ia5f91298a4b01b62adebc8adc30f27f757259588
2016-08-02 20:45:06 +00:00
Calvin On
1fef349549
Merge \"Guard concurrent accesses to BluetoothA2dp service object\" into nyc-mr1-dev
...
am: 30ec4f2732
2016-06-22 02:38:11 +00:00
Calvin On
d7d16b9f37
Guard concurrent accesses to BluetoothA2dp service object
...
This fixes potential NPEs that happen on methods that access
mService after checking nullness, i.e. getConnectedDevices.
Bug: 29514788
Change-Id: Ic97054fd5a3563a374c0e863fb116c52535a6509
2016-06-22 01:08:03 +00:00
Marie Janssen
fb0ee69ad0
Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 51f620d98d
...
am: 30975ad80b
2016-06-21 23:40:28 +00:00
Marie Janssen
30975ad80b
Merge \\"Fix links to Bluetooth Guide\\" am: 6ba39e5642
...
am: 51f620d98d
2016-06-21 21:38:25 +00:00
Marie Janssen
51f620d98d
Merge \"Fix links to Bluetooth Guide\"
...
am: 6ba39e5642
2016-06-21 21:34:13 +00:00
Marie Janssen
382871b03f
Fix links to Bluetooth Guide
...
Change-Id: I5798c3d71c7cc9c509e0f7b04fa140168b0fdc11
2016-06-20 10:26:31 -07:00
Christine Hallstrom
ac1873b2fc
Merge "Fix early termination of while loop in BluetoothSocket#write" into nyc-mr1-dev
2016-06-20 17:23:02 +00:00
Calvin On
8dad883759
Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
...
am: 1bf8782605
2016-06-18 02:22:50 +00:00
Christine Hallstrom
fc59c344bf
Fix early termination of while loop in BluetoothSocket#write
...
While loop exits too early and misses writing remaining bytes.
Also restructured the loop itself to be more readable.
Change-Id: I71e9b331d20b5ae70175450c3346be43ab56c40c
2016-06-18 00:09:45 +00:00
Calvin On
a0b91d77d6
Fix race with BT disable in BLE_ON_STATE
...
This will restart the BT stack when it detects a transition
into OFF state while the user enable flag (mEnable) is set.
Bug: 29363429
Change-Id: I9839119b34c4694ad92e96240c6989008b2f8d52
2016-06-17 21:18:21 +00:00
ugo_yu
f308ab01dc
Correct typo in BluetoothSap binder
...
This patch fixed IBluetoothSap typo as IBluetoothMap in doBind.
Fixes: 29025598
Change-Id: Ieab3d1583839db0a33b1cfa4d2de1f27c9cb3fe4
2016-06-16 21:02:39 +00:00
Mudumba Ananth
0d98ebf997
HFP 1.7 profile update (3/4)
...
-> Android Framework changes to add support for
an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
of the supported HF indicators and their values (if received)
Bug: 19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
2016-06-02 10:21:55 +00:00
Christine Hallstrom
995c90aa18
Properly check if BT is off when shutting down radios
...
Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.
Bug: 27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
2016-05-26 13:20:56 -07:00
Pavlin Radoslavov
9a69daa706
Add missing "try ... finally" safeguards
...
Safeguards for code protected by ReentrantReadWriteLock.
Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit e957a8a0b4
2016-05-24 17:14:51 -07:00
Pavlin Radoslavov
e957a8a0b4
Add missing "try ... finally" safeguards
...
Safeguards for code protected by ReentrantReadWriteLock.
Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
2016-05-24 22:57:14 +00:00
