Commit Graph

737 Commits

Author SHA1 Message Date
Marie Janssen
6685014f34 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b am: dbb8ffc47d
am: 21688f8e34

Change-Id: I53b686ada774a48049dc76c58568746880e74978
2016-09-21 07:25:03 +00:00
Marie Janssen
21688f8e34 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 am: 532d2b11a3 am: 6f514cc82b
am: dbb8ffc47d

Change-Id: I695df247f11b6bce15d3f771e4cc2edfd7c86f10
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

Change-Id: I88928de86c08a148b3124c616b309862da1a1c24
2016-09-21 01:59:29 +00:00
Marie Janssen
6f514cc82b Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048
am: 532d2b11a3

Change-Id: Iee468d3bcfd72b33475e9bf1d51865f3c5e8a4a2
2016-09-21 01:02:29 +00:00
Sanket Agarwal
b5fbb75aa2 Remove APIs that are not directly usable
This API is now exposed via MediaBrowser.

Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
2016-09-20 17:52:17 -07:00
Marie Janssen
532d2b11a3 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27
am: e3812fc048

Change-Id: I6119aa9db2792a149202c16d63de205ba32423e8
2016-09-21 00:46:01 +00:00
Marie Janssen
e3812fc048 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f
am: 3106e3ae27

Change-Id: I0748eed7b884294d993b4538e4e65397b6f0dbb2
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
2dd2fead45 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 am: 9f341e4e49
am: 8348bd2317

Change-Id: I15b6c8ab87822e5f33bdfabcb8e09e8ce9501cd7
2016-09-01 01:27:03 +00:00
Jakub Pawlowski
8348bd2317 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242
am: 9f341e4e49

Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132
2016-08-31 18:28:45 +00:00
Jakub Pawlowski
9f341e4e49 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a
am: 40a16ea242

Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c
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
c63c19122f resolve merge conflicts of a544221 to nyc-dev-plus-aosp am: 309813c8af
am: ac0b242755

Change-Id: Ia3bb6a624d0696a630df48073bd87595504b4ae1
2016-08-29 23:20:04 +00:00
Hemal Patel
ac0b242755 resolve merge conflicts of a544221 to nyc-dev-plus-aosp
am: 309813c8af

Change-Id: Ia316e53bf0fd163da67676acfd52d3e31d9e2149
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
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
1366a9a4fb resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776 am: 84b61fb4b0
am: ecd10beefd

Change-Id: I4d72144cfd66a51fe8e2aaaf93ed4c4981830d3b
2016-08-11 23:17:53 +00:00
Jakub Pawlowski
ecd10beefd resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776
am: 84b61fb4b0

Change-Id: Id1dc84ba248e6d91bcab28f94b9c2b29dc16787d
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
Andre Eisenbach
2ae1b0f350 Merge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445 am: 4184bab40b
am: de5ad04c2b

Change-Id: I096f59ffeb24844413ca85dbfa0c9585246870cf
2016-08-04 21:42:06 +00:00
Jakub Pawlowski
de5ad04c2b Merge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445
am: 4184bab40b

Change-Id: I0aaae022f62cde8fab51c258313b00764a0ce799
2016-08-04 21:37:53 +00:00
Jakub Pawlowski
83272db445 Merge "Fix bad index usage"
am: 5cfe8a8315

Change-Id: I36807979de4f0f74f9dd3ef6f3b2a60e83346b0f
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

Change-Id: I0211cecf91f324d24b7b5524344812f7d6b6602a
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
d92a9bbff7 Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7eaf am: 0aa5797976 am: ed042c00e0
am: 9dd9e1a635

Change-Id: I418e61d8d60d53980c43c15a2d01ce32005c5eb3
2016-08-04 00:34:12 +00:00
Jakub Pawlowski
9dd9e1a635 Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7eaf am: 0aa5797976
am: ed042c00e0

Change-Id: I524d324c44f545989cd10a79143928ad57f8332d
2016-08-04 00:19:14 +00:00
Jakub Pawlowski
0aa5797976 Merge "Remove write type from GATT descriptor writes (1/4)"
am: b7eb1d7eaf

Change-Id: Ibe16bab7ec21d19d6f3cfd5cb65768b06a5ca829
2016-08-04 00:01:25 +00:00
Tobias Thierer
c0cc71e076 Merge "Fixes the system server crash issue caused by uncatched exception." am: b68106cf2a am: ca7a43b5da am: 3b5e46bf9b
am: ca08f14d6b

Change-Id: I09dbe007a20414ed8598b660bc2af59b221b6567
2016-08-03 20:24:10 +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

Change-Id: Ia82c41019c18342f4971b4803fa898999c67d7b9
2016-08-03 13:12:02 +00:00
Jakub Pawlowski
fe4b1e47fc Merge "GATT Server refactoring (2/4)"
am: d13954e8c6

Change-Id: I10383d95f79409282d96ae60b294c72754df5641
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
Svetoslav Ganov
ac69be543f Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
2016-07-22 20:40:35 -07:00
Sanket Agarwal
40bb6f3f8f Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
2016-06-29 18:58:09 +00:00
Calvin On
2e540390ec Merge \\"Guard concurrent accesses to BluetoothA2dp service object\\" into nyc-mr1-dev am: 30ec4f2732
am: 1fef349549

Change-Id: I0e8fe0754588fc162482275f05d8aef9a8d97711
2016-06-22 02:44:20 +00:00
Calvin On
1fef349549 Merge \"Guard concurrent accesses to BluetoothA2dp service object\" into nyc-mr1-dev
am: 30ec4f2732

Change-Id: Ie9bcb2474c002b8118666c413d864b05eaf0245c
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
e55a3669a8 Merge \\\\"Fix links to Bluetooth Guide\\\\" am: 6ba39e5642 am: 51f620d98d am: 30975ad80b
am: fb0ee69ad0

Change-Id: I9f940c9ae6aa2845d68788bb75343754c36dee65
2016-06-22 00:12:21 +00:00
Marie Janssen
fb0ee69ad0 Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 51f620d98d
am: 30975ad80b

Change-Id: I99e17125cf95165b911c6e8f294e2f020d483cb2
2016-06-21 23:40:28 +00:00
Marie Janssen
30975ad80b Merge \\"Fix links to Bluetooth Guide\\" am: 6ba39e5642
am: 51f620d98d

Change-Id: I3818fdbfc3ad60a731bdf3b7f047a2afca04ad2e
2016-06-21 21:38:25 +00:00
Marie Janssen
51f620d98d Merge \"Fix links to Bluetooth Guide\"
am: 6ba39e5642

Change-Id: I0f4e84245e05a19403603121a9138c2076ef2282
2016-06-21 21:34:13 +00:00
Christine Hallstrom
955f8ab45c Merge \\"Fix early termination of while loop in BluetoothSocket#write\\" into nyc-mr1-dev am: ac1873b2fc
am: eb7dc19a1a

Change-Id: Ice60ffc37dbbcc317cad8db04e01234e7e923cf8
2016-06-20 17:54:57 +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

Change-Id: I60d35a8139caf0a1c839654d6c488fede4fa37d7
2016-06-18 02:22:50 +00:00
Calvin On
173600e853 Merge \\\"Fix race with BT disable in BLE_ON_STATE\\\" into nyc-dev am: 1bf8782605 am: c535f2a520
am: db78416206

Change-Id: I9e9bcde7870f345dac8c5112b78de09263f17623
2016-06-18 00:30:33 +00:00
Andre Eisenbach
db78416206 Merge \\"Fix race with BT disable in BLE_ON_STATE\\" into nyc-dev am: 1bf8782605
am: c535f2a520

Change-Id: Ia7a8c209cb4a743d369b51f0ddc3517d18d92f0a
2016-06-18 00:25:17 +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