Zach Johnson
ddeb2990a3
Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a am: 2fb54515a2
...
am: b39a419fa4
Change-Id: Ie90be956ab6e52602ee72fa224ef471bb7bade38
2019-12-06 15:40:42 -08:00
Zach Johnson
b39a419fa4
Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a
...
am: 2fb54515a2
Change-Id: Id6f1c11c447ff1896b5df81a7625a643ecebce46
2019-12-06 15:34:45 -08:00
Zach Johnson
bd4031de4a
Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled"
...
* changes:
Collapse the implementations of BluetoothDevice.createBond
Call parameterized version of IBluetooth.enable
Implement isEnabled in terms of getState
2019-12-06 23:20:07 +00:00
Rahul Sabnis
18b3802b15
Merge "Make BluetoothUuid constants and some functions System Apis" am: f6ea5afa58 am: f9f689020c
...
am: 7232ba49c8
Change-Id: Ief860164e931a234ccc82417f645cee0d0be6235
2019-12-06 00:35:34 -08:00
Rahul Sabnis
fb486c21d9
Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7 am: 12558824e4
...
am: c0efc04ea7
Change-Id: I9c3f6d5eedcb1197908c8a2cf208215a458cd25d
2019-12-06 00:32:21 -08:00
Rahul Sabnis
7232ba49c8
Merge "Make BluetoothUuid constants and some functions System Apis" am: f6ea5afa58
...
am: f9f689020c
Change-Id: Ie4e80f2682d0a4d18e9ee3f57dd457d9bd0ff6ff
2019-12-05 17:41:34 -08:00
Treehugger Robot
f6ea5afa58
Merge "Make BluetoothUuid constants and some functions System Apis"
2019-12-06 01:23:39 +00:00
Rahul Sabnis
c0efc04ea7
Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7
...
am: 12558824e4
Change-Id: I70c293538b2b993800e8a77da8491237d21b0f9c
2019-12-05 16:25:12 -08:00
Rahul Sabnis
5f457c0586
Refactor BluetoothHeadset APIs used by Settings
...
Bug: 143244793
Test: Manual
Change-Id: I399a1e0f93cb01c44817604edfcaa8fe5061142f
2019-12-04 16:49:21 -08:00
Rahul Sabnis
1223087ee3
Make BluetoothUuid constants and some functions System Apis
...
Bug: 143245929
Test: Manual
Change-Id: I5519a379a2bb5d56fe25745d8bdeaa5cf52d9e92
2019-12-04 11:24:57 -08:00
Automerger Merge Worker
8ed8527519
Merge "Rename priority to connection policy in bluetooth apis" am: 98c91be8ae am: a115281a2d
...
Change-Id: I243cf844883e088f82613a97fe061468bc126cdb
2019-12-04 17:37:42 +00:00
Rahul Sabnis
a115281a2d
Merge "Rename priority to connection policy in bluetooth apis" am: 98c91be8ae
...
am: 0f3bfe6c3b
Change-Id: I30f8e10c9f240b648dae695b8a7c859fb754fe00
2019-12-04 08:48:47 -08:00
Automerger Merge Worker
9c965a575a
Merge "Add SystemApi to setActiveDevice in BluetoothAdapter" am: 52df59acb3 am: 9c8e9bcc68
...
Change-Id: I8bd8be4848dbab16882dbf368a8faa886635cd89
2019-12-04 15:56:19 +00:00
Rahul Sabnis
9c8e9bcc68
Merge "Add SystemApi to setActiveDevice in BluetoothAdapter" am: 52df59acb3
...
am: 3d59aefb50
Change-Id: Ib5db2cced863edb9e60c81d80dea6102273e69bc
2019-12-04 07:44:01 -08:00
Treehugger Robot
98c91be8ae
Merge "Rename priority to connection policy in bluetooth apis"
2019-12-04 01:11:46 +00:00
Rahul Sabnis
c452697717
Add SystemApi to setActiveDevice in BluetoothAdapter
...
Bug: 145004683
Test: Manual
Change-Id: I70f46bb0153a8a0f3755dc2b3e26e556bd092daa
2019-12-02 15:36:11 -08:00
Rahul Sabnis
df1ef4aa62
Rename priority to connection policy in bluetooth apis
...
Bug: 145005327
Test: Manual
Change-Id: I43ad57feb7dd70f39005ad7a01bc7dac6fb7b639
2019-12-02 14:44:54 -08:00
Zach Johnson
ae98cec967
Collapse the implementations of BluetoothDevice.createBond
...
The backend is now a single function. Remove duplicate code/
Bug: 145171640
Test: compile, and try pairing
Change-Id: I04e8f95430d0de245926e849ea71eff030294bc1
2019-11-26 21:55:15 -08:00
Zach Johnson
76236d77f4
Implement isEnabled in terms of getState
...
Bug: 145171640
Test: compile & check everything works normally
Change-Id: I169e220ab83546d76317e518652c66c9bd2229a2
2019-11-26 21:33:59 -08:00
Rahul Sabnis
fe521bfca6
Merge "Resolve API dependencies on BluetoothPan" am: bad5a30d4f am: e89625113d
...
am: 8c6b4a1938
Change-Id: I1fbeb090cff73c1902ee676bfb2e0848d1ac5988
2019-11-25 07:31:07 -08:00
Rahul Sabnis
8c6b4a1938
Merge "Resolve API dependencies on BluetoothPan" am: bad5a30d4f
...
am: e89625113d
Change-Id: Ifa162b24cf19f85f15f10e0ce975bf3006979a71
2019-11-22 15:07:44 -08:00
Rahul Sabnis
a052447ad6
Resolve API dependencies on BluetoothPan
...
Bug: 143244283
Test: Manual
Change-Id: Ie419b2f83358d06d094dcf4921c4595fc0e72857
2019-11-21 13:16:02 -08:00
David Castro
27f1afdda0
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456 am: 6d62047661 am: e93ab1d3ee
...
am: 345de96beb
Change-Id: Ifb4c0e5a0dbf865c75864dedc9d6b58d6c5e11a9
2019-11-21 05:08:26 -08:00
David Castro
345de96beb
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456 am: 6d62047661
...
am: e93ab1d3ee
Change-Id: Ie0b77841701c25534cb181a0f25ba1a4ee6262be
2019-11-21 05:00:02 -08:00
David Castro
e93ab1d3ee
Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456
...
am: 6d62047661
Change-Id: I5c57f96546f33a7746013fc1ae23332d8e5014b7
2019-11-21 04:52:27 -08:00
David Castro
7904f376bb
Removed the confusing note as per guidance from mylesgw@ in
...
BUG:117309989.
Change-Id: I07680c04798642d21420bbea5c6b592c1c741f43
2019-11-21 03:44:32 +00:00
Rahul Sabnis
822a120801
DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"
...
This reverts commit 07c1280421 , reversing
changes made to d26ea8807f .
Bug: 144619932
Test: Manual
Change-Id: Ie9a46c9527004759a250dc71d2a1065ff3bb7328
2019-11-19 18:30:57 -08:00
Treehugger Robot
944fed6b66
Merge "Revert "Re-add getAliasName to fix build breakage""
2019-11-19 19:44:45 +00:00
Treehugger Robot
d007cfcdf4
Merge "Add method to convert profile ID into human readable string"
2019-11-19 18:04:03 +00:00
Rahul Sabnis
7700b81cb3
Merge "Create systemapis to connect/disconnect all bt profiles"
2019-11-18 23:15:06 +00:00
Rahul Sabnis
91edb7e642
Revert "Re-add getAliasName to fix build breakage"
...
This reverts commit d14320d21c .
Reason for revert: Removing method again and will make changes on internal to prevent breakage
Change-Id: I41cb918df90a203fd6a03f4b51464300de9428f8
2019-11-18 18:59:55 +00:00
Rahul Sabnis
d14320d21c
Re-add getAliasName to fix build breakage
...
Bug: 144619887
Test: Manual
Change-Id: Ib4f3582a1c9cb8cbcb14fece6a3ab463b3400cea
2019-11-16 11:52:13 -08:00
Rahul Sabnis
0d33ef9a5a
Create systemapis to connect/disconnect all bt profiles
...
Bug: 143495377
Test: Manual
Change-Id: I80d816083ef568df319afddfd4557ef74d37d16f
2019-11-15 16:18:25 -08:00
Rahul Sabnis
24ad4b561c
Refactor methods to access/modify BluetoothDevice alias and name
...
Bug: 142352567
Test: Manual
Change-Id: I86bb69faed1c6d46ac668816e6081bd1673fbf85
2019-11-14 12:58:48 -08:00
Ugo Yu
2712d4fc14
Add method to convert profile ID into human readable string
...
Bug: 136068566
Test: adb shell dumpsys bluetooth_manager
Change-Id: I9f354ecbe20caf058c9de843180b7a07de7af569
2019-11-14 19:23:23 +08:00
TreeHugger Robot
2dbc1c0d82
Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable" into qt-qpr1-dev
2019-11-13 02:48:43 +00:00
Rahul Sabnis
644d3dd923
Refactor BluetoothAdapter APIs used by Settings
...
Bug: 143238544
Test: Manual
Change-Id: Ia831d2b4b628b746493602857bcb54b585f13e12
2019-11-04 21:55:54 +00:00
Treehugger Robot
c8d3cde31e
Merge "Bluetooth doc: The is a -> This is a"
2019-10-23 22:32:54 +00:00
Myles Watson
1254da6333
Bluetooth doc: The is a -> This is a
...
Fixes: 142364826
Test: build
Change-Id: I9bde35140bdfc4d76df7e8c427ac6e8baceee611
2019-10-23 20:38:57 +00:00
Cheney Ni
bd9900a4f0
Add helpers to check whether the BluetoothCodecConfig instance is selectable
...
There will be a helper in the BluetoothCodecStatus to check whether the
codec config is matched the selectable array. It uses 3 smaller helpers
to confirm the codec config has none (wildcard matching), or one and only
one value for the audio feeding parameters.
Besides, this CL also adds a helper to compare whether two codec configs
are similar or not, and uses NONE values as wildcard.
Bug: 131147224
Bug: 133719424
Test: atest -t BluetoothInstrumentationTests:com.android.bluetooth.a2dp
Change-Id: I7d8f1a16b8358c440841801d95471b2d010739ec
Merged-In: I7d8f1a16b8358c440841801d95471b2d010739ec
(cherry picked from commit f1936c3423 )
2019-10-08 11:26:15 +08:00
Christian Wailes
d9bce3cfff
Merge "Revert "Revert "Remove a misleading "flush" function."""
2019-09-11 18:23:50 +00:00
Christian Wailes
647fee87dc
Revert "Revert "Remove a misleading "flush" function.""
...
This reverts commit 47da177405 .
Reason for revert: Fixed the test broken by the original commit
Bug: 139192244
Bug: 140336855
Test: m -> flash -> boot
Test: atest CtsJvmtiAttachingHostTestCases
Change-Id: I4c67ad8709652c4710ef24564e0240f74f817f8c
2019-09-04 23:37:32 +00:00
Ian Kasprzak
783313acbf
Merge "Revert "Remove a misleading "flush" function.""
...
am: 9fcf8b7cae
Change-Id: Ic6fafd4ed9bf6dfc001120dced903b14cf907d1d
2019-09-02 08:47:30 -07:00
Ian Kasprzak
9fcf8b7cae
Merge "Revert "Remove a misleading "flush" function.""
2019-09-02 15:28:20 +00:00
Dan Harms
6006a30059
Merge "Include BLE<->SPP transition states in isLeEnabled"
...
am: ac413db400
Change-Id: I15a67ad7b277b345b96f2a7cf852554ed6fee267
2019-09-01 14:59:54 -07:00
Treehugger Robot
ac413db400
Merge "Include BLE<->SPP transition states in isLeEnabled"
2019-09-01 21:45:21 +00:00
Ian Kasprzak
47da177405
Revert "Remove a misleading "flush" function."
...
This reverts commit 9d8b926859 .
Reason for revert: Driodcop: aosp-master test-mapping showing multiple failures (b/140336855).
Change-Id: If44e273dd111802db8b44db1e5a67a4628c72e3c
2019-08-31 21:28:50 +00:00
Christian Wailes
932b360d45
Merge "Remove a misleading "flush" function."
...
am: d6f04e744d
Change-Id: I31a2c6a8b49493ea85816071874c3e08841f233f
2019-08-30 16:24:39 -07:00
Christian Wailes
d6f04e744d
Merge "Remove a misleading "flush" function."
2019-08-30 22:59:41 +00:00
markchien
5bacf82587
Passing caller package name to setBluetoothTethering
...
This is necessary to examine caller's permission. If caller's uid is not
same as passing package name, SecurityException would be throwed.
This change also clear the identity before calling
BluetoothPan#setBluetoothTethering() in Tethering#setBluetoothTethering.
This is fine because caller already pass permission check before in
ConnectivityService. See the flow below:
ConnectivityManager#startTethering -> ConnectivityService#startTethering
-> Tethering#startTethering -> Tethering#setBluetoothTethering
-> BluetoothPan#setBluetoothTethering
Bug: 134649258
Test: -build, flash, boot
-atest FrameworkNetTests
-manual test with bluetooth OFF/ON
Change-Id: I2140398ad3bbc8076f729c843f0515c654553aaf
Merged-In: I2140398ad3bbc8076f729c843f0515c654553aaf
2019-08-29 08:53:01 +00:00