Commit Graph

1467 Commits

Author SHA1 Message Date
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
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
Mark Chien
b2d0c6357c Merge "Passing caller package name to setBluetoothTethering"
am: 751f034b82

Change-Id: I7f6b22e4b8273cbdb3b40a7dd926e838d6fa7455
2019-08-28 03:12:54 -07:00
Chris Wailes
9d8b926859 Remove a misleading "flush" function.
This patch removes LocalSocketImpl.flush().  In practice this function
was simply a wrapper around `Thread.sleep(10)`.  All direct calls to
this function have been removed.  The `flush()` function is still called
on several objects that wrap a SocketOutputStream.

This will make booting a device 20ms faster than it currently is.

Bug: 139192244
Test: Build -> flash -> boot -> launch app
Change-Id: I0a96f4bc72461670370f61e847349f32af5ac774
2019-08-27 14:51:21 -07:00
markchien
560c3ac1dc 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
2019-08-27 23:26:20 +08:00
Dan Harms
2d7e1873d1 Include BLE<->SPP transition states in isLeEnabled
Fixes: 138997297
Test: Start scan while in transition and observe no exceptions
Change-Id: Ib8b05c30c3db8e398194572a179028647e703a9f
2019-08-07 08:48:04 -07:00
Cheney Ni
af3615e586 Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable"
am: 8052fac1b1

Change-Id: I7718d3f12541bcbb005f7e1930267a1393f9b19a
2019-07-29 20:00:37 -07:00
Treehugger Robot
8052fac1b1 Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable" 2019-07-30 02:28:52 +00:00
Deqiang Chen
92485e41b8 Merge "Define intent for receive vendor specific response and define a function to send vendor AT command from Hfp client"
am: a0b2086373

Change-Id: I4101b1119d583c8d45c0bbde6d1955b97176d656
2019-07-24 14:27:52 -07:00
Cheney Ni
f1936c3423 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
2019-07-23 20:32:06 +08:00
Deqiang Chen
2fec85d6f6 Define intent for receive vendor specific response and define a function to send vendor AT command from Hfp client
Bug: 132813146

Test: Local test with Kitchensink: able to send vendor command and
receive response.

Change-Id: I9a6debbacb1a5ad6445416c067d3d35849906685
2019-07-12 10:08:11 -07:00
Mathew Inwood
13ffa87a6d Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I320e33be57b8124ff7c132a67c8981d53802f8f5
2019-06-28 07:43:43 -07:00
Mathew Inwood
3a75f264a8 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
2019-06-28 10:15:37 +01:00
Andrei-Valentin Onea
882defd836 Merge "Document public alternatives to greylisted APIs" am: 3647eb620b
am: 3641066567

Change-Id: Ia21d1ce57a2cbffe8b417d6f1d5535924c7ea162
2019-06-19 07:21:29 -07:00