Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
444,900 Commits 3 Branches 0 Tags
cb86457ddbf58bc6222f3ca27a021bb7752cdcb5
Commit Graph

1564 Commits

Author SHA1 Message Date
Treehugger Robot
bb3874364f Merge "Independent methods to enable/disable BLE mode" 2020-03-30 01:20:19 +00:00
Treehugger Robot
364534c3d2 Merge "BluetoothHearingAid System APIs now throw an exception if a null BluetoothDevice is passed in" 2020-03-26 10:07:30 +00:00
Rahul Sabnis
eb5712abd2 BluetoothHearingAid System APIs now throw an exception if a null 
BluetoothDevice is passed in

Bug: 149238489
Test: Manual
Merged-In: I594f558bfe1e286bf74dd8dc3db4c8497fd0a025
Change-Id: I594f558bfe1e286bf74dd8dc3db4c8497fd0a025
 2020-03-25 13:50:36 -07:00
Ugo Yu
644a6d52a6 Independent methods to enable/disable BLE mode 
* Use IBluetoothManager.enableBle() and disableBle() to toggle BLE only
  mode instead of updateBleAppCount() then enable().
* Fix BluetoothAdapter.disableBle sometime won't disable Bluetooth.
* Add active log if Bluetooth is disabled via disableBle().

Bug: 139454316
Test: enableBle() -> disableBle() and check Bluetooth is OFF.
Change-Id: I173d5fed1b47ff68a6504741e25754e65cbd1455
 2020-03-25 17:47:19 +08:00
Rahul Sabnis
8bc55739e7 Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth SystemApis and for hidden connect/disconnect APIs. 
Hide some APIs that were previously marked as @UnsupportedAppUsage and re-add annotation as changing the permissions for these SystemApis would break the unsupported app contract that was previously there. Therefore, we're choosing to hide them until we have a good story on how to deal with them next release.

Bug: 148689314
Test: Manual
Merged-In: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a
Change-Id: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a
 2020-03-21 04:14:29 +00:00
Treehugger Robot
e8640349ed Merge "BluetoothHearingAid#getHiSyncId now consistently uses the term HiSyncId (removed all references to CustomerId) and added link to explain what the HiSyncId represents" 2020-03-19 20:01:07 +00:00
Rahul Sabnis
3c7e8444f5 BluetoothHearingAid#getHiSyncId now consistently uses the term HiSyncId 
(removed all references to CustomerId) and added link to explain what
the HiSyncId represents

Bug: 149238489
Test: Manual
Change-Id: I4ff2a8d46f3fc5d06a29829a69a27a0c15e466f8
 2020-03-19 11:44:54 -07:00
Rahul Sabnis
cd3bee95ed Revert "Revert "Require user pass in a non-null BluetoothDevice ..." 
Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."

Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."

Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA

Reason for revert: Fixing breakage
Reverted Changes:
I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass...
I771ca0d57:Revert "Need to now pass in active device instead ...
I76529c7a1:Revert "Pass in active device to all BluetoothA2dp...
I297bda68d:Revert "Require user pass in a non-null BluetoothD...
I525327959:Revert "Pass in active device to all BluetoothA2dp...
I1d8660b11:Revert "Pass in active device to all BluetoothA2dp...

Bug: 147287141
Test: Manual
Merged-In: I91ee6878cac1b84bd289278a1b965658a26fe4db
Merged-In: I4d7d971af75bff8967fd807d34dad90c32e24eba
Change-Id: I4d7d971af75bff8967fd807d34dad90c32e24eba
 2020-03-18 11:10:24 -07:00
Treehugger Robot
365caf6f04 Merge "Update permissions of BluetoothPan System APIs and re-hide some APIs that do not need to be System APIs." 2020-03-10 19:13:52 +00:00
Treehugger Robot
1bb18d83eb Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" 2020-03-10 17:28:27 +00:00
Rahul Sabnis
d479374757 Update permissions of BluetoothPan System APIs and re-hide some APIs 
that do not need to be System APIs.

Bug: 146045934
Test: Manual
Change-Id: Ic6325fde05294eb0266fee25f4b3e7098749a287
 2020-03-09 16:58:34 -07:00
Rahul Sabnis
ded588641b Add error code for BluetoothDevice#getBatteryLevel to represent 
Bluetooth is off

Bug: 147428695
Test: Manual
Change-Id: I07c2fa49954632da6aa6a93706883e4cdfd32fa6
 2020-03-06 18:04:15 -08:00
Automerger Merge Worker
a1b84782c5 Merge "Update BluetoothDevice SystemApi permissions and disallow passing a null pin to BluetoothDevice#setPin" am: 5f1daae19f 
Change-Id: I4204ee9c10101d99fc8e4bad4ee44fc431f2cb9f
 2020-03-04 19:28:11 +00:00
Rahul Sabnis
5f9232f3f7 Update BluetoothDevice SystemApi permissions and disallow passing a null 
pin to BluetoothDevice#setPin

Bug: 147428695
Test: Manual
Merged-In: I74613d61420babecf5f1976fe33a2e1a729b71a1
Change-Id: I74613d61420babecf5f1976fe33a2e1a729b71a1
 2020-03-03 11:29:58 -08:00
Automerger Merge Worker
b8f0a92e0b Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788 
Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
 2020-03-01 03:34:53 +00:00
Treehugger Robot
6bd37ba788 Merge "Sanitize Bluetooth device names without regex" 2020-03-01 03:21:38 +00:00
Dan Sandler
1add9f0bc2 Sanitize Bluetooth device names without regex 
Saves a considerable amount of RAM.

Fixes: 145623858
Test: Pair with a simulated device with whitespace in the name
Change-Id: I1c8b00922534ee5941be6b14948c0941c5640862
 2020-02-28 16:45:23 -08:00
Automerger Merge Worker
7e3f076b2c Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." am: a9e6a280f8 
Change-Id: Iee457f25ea65b2507986f7e111341fc9924f56e3
 2020-02-26 18:01:50 +00:00
Rahul Sabnis
f9e92a836f Add missing RequiresPermission annotations in BluetoothHidHost and 
BluetoothMap APIs, disallow null device input for setConnectionPolicy,
getConnectionPolicy, and getConnectionState in BluetoothHidHost, and
BluetoothMap implements AutoCloseable, its close() method is public, and
utilizes a CloseGuard.

Bug: 149238030
Test: Manual
Change-Id: I8add9e26afcaf1a988c15e3cc7f8c446491f0686
 2020-02-25 12:03:48 -08:00
Automerger Merge Worker
4b67009cb2 Merge "Update javadoc to reflect that BluetoothPbap#setConnectionPolicy returns true on successfully setting the connection policy instead of on disconnection. It also now indicates that if BluetoothProfile#CONNECTION_POLICY_FORBIDDEN is passed in, the profile will be disconnected." am: a09e9e4fe1 
Change-Id: I576a4f4f233f2e84d623d739090141e862db38d8
 2020-02-25 09:56:24 +00:00
Rahul Sabnis
746e713d80 Update javadoc to reflect that BluetoothPbap#setConnectionPolicy returns 
true on successfully setting the connection policy instead of on
disconnection. It also now indicates that if
BluetoothProfile#CONNECTION_POLICY_FORBIDDEN is passed in, the profile
will be disconnected.

Bug: 148966894
Test: Manual
Change-Id: I881c240fcbce0c8148625c35e6e88ab02ea7122f
 2020-02-24 13:28:30 -08:00
Automerger Merge Worker
940853b36f Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" am: 88fba38a1c 
Change-Id: If1599cabe081cd259051ffd36e2a597443919de7
 2020-02-10 23:29:58 +00:00
Treehugger Robot
88fba38a1c Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" 2020-02-10 23:16:52 +00:00
Automerger Merge Worker
687ef90ac5 Merge "Update BluetoothPbap class description to indicate how to create an instance of the class, add intdef to return value of BluetoothPbap#getConnectionState, and move all SystemApis to require the BLUETOOTH_PRIVILEGED permission" am: cc89e59203 
Change-Id: I96de10ac130e3737911c050e0a76e30602c85721
 2020-02-10 22:57:46 +00:00
Rahul Sabnis
eaa088f14b BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission 
Bug: 149216030
Test: Manual
Change-Id: Ib28c7f3133eb96c1ba0b43c8b140babde699d5f4
 2020-02-10 14:02:25 -08:00
Rahul Sabnis
b0a9a5dfac Update BluetoothPbap class description to indicate how to create an 
instance of the class, add intdef to return value of
BluetoothPbap#getConnectionState, and move all SystemApis to require
the BLUETOOTH_PRIVILEGED permission

Bug: 148966894
Test: Manual
Change-Id: I4a798b0a16ab839f2047fc58f21c420cc99b6db6
 2020-02-07 17:21:21 -08:00
Automerger Merge Worker
1f65bc19d4 Merge "BluetoothAdapter#connectAllEnabledProfiles and BluetoothAdapter#disconnectAllEnabledProfiles updated to require BLUETOOTH_PRIVILEGED permission and update documentation to indicate connection and disconnection is asynchronous" am: 750ab04052 
Change-Id: Ie1a3555e3ca5d6a137142d3693850d72184cd3b6
 2020-02-06 04:46:01 +00:00
Rahul Sabnis
966cef37c2 BluetoothAdapter#connectAllEnabledProfiles and 
BluetoothAdapter#disconnectAllEnabledProfiles updated to require
BLUETOOTH_PRIVILEGED permission and update documentation to indicate
connection and disconnection is asynchronous

Bug: 147321746
Test: Manual
Change-Id: I961f02a539a247b1397ce4f478b9dc804d9973ab
 2020-02-05 16:37:18 -08:00
Automerger Merge Worker
cd3f28071e Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 
Change-Id: I3a222fe93c7cc4bfc0b967e51b633ceb0605c642
 2020-02-05 00:50:59 +00:00
Rahul Sabnis
99507b5eb3 Change data type of duration param from int representing seconds to long 
representing milliseconds in BluetoothAdapter#setScanMode

Bug: 144380530
Test: Manual
Change-Id: I76528478a64d22afefd4ec964d1a78295dd3c94f
 2020-02-04 14:29:09 -08:00
Automerger Merge Worker
bbfcf7fc56 Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f5b 
Change-Id: I363ded95542c1402b6828d5475e04d2554c8d01e
 2020-02-01 23:41:15 +00:00
Automerger Merge Worker
44d8a611c4 Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" am: f0f3a0f48e 
Change-Id: Ia5a08318ebdfdee7634a6cec492b36f35e143870
 2020-02-01 23:37:45 +00:00
Treehugger Robot
7a028c7f5b Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" 2020-02-01 23:37:34 +00:00
Treehugger Robot
f0f3a0f48e Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" 2020-02-01 23:27:10 +00:00
Automerger Merge Worker
8752cb4fc7 Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: ea711aba95 
Change-Id: Ib585b2b8831e12ba8231704a99a47ceaf0da0e8e
 2020-02-01 22:32:12 +00:00
Treehugger Robot
ea711aba95 Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" 2020-02-01 22:21:27 +00:00
Rahul Sabnis
e75a016d1b Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to 
android.bluetooth.device.action.ALIAS_CHANGED from
android.bluetooth.action.ALIAS_CHANGED

Bug: 146158681
Test: Manual
Change-Id: Ie247568ff3e5a750d74f22636aca69e3e74a55f5
 2020-01-31 10:38:02 -08:00
Automerger Merge Worker
5404d58320 Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi BluetoothHidDevice#setConnectionPolicy" am: 3c57a25b4f 
Change-Id: I37da24b0dd04118a937378414412ee17acf79c70
 2020-01-31 16:38:55 +00:00
Automerger Merge Worker
802c49bb00 Merge "Add api BluetoothAdapter.getMostRecentlyConnectedDevices() to be able to get connected devices ordered by how recently they were connected" am: 4f833efcbb 
Change-Id: I5bd4a18d9f66d8a7cf59b4d7d6c0c725be2b269e
 2020-01-31 16:10:50 +00:00
Rahul Sabnis
e6f17155da Add new API BluetoothAdapter#removeActiveDevice to replace calls to 
BluetoothAdapter#setActiveDevice with a null device

Bug: 147428526
Test: Manual
Change-Id: I838448a504515d5a8b1eec254ccc1d9414239475
 2020-01-30 16:59:02 -08:00
Rahul Sabnis
f93a469cec Add BLUETOOTH_PRIVILEGED permission to SystemApi 
BluetoothHidDevice#setConnectionPolicy

Bug: 148597061
Test: Manual
Change-Id: I03875cb71483d3d6e18795324a7fbea6681fb9b0
 2020-01-30 13:49:35 -08:00
Rahul Sabnis
98c6c7c4c9 Add privileged permission to SystemApi BluetoothDevice#setAlias 
Bug: 144792904
Test: Manual
Change-Id: Ie11109736bb0eb4cd0f06c38db44805c0169ac5f
 2020-01-30 12:02:17 -08:00
Rahul Sabnis
791dedb43f Add api BluetoothAdapter.getMostRecentlyConnectedDevices() to be able to 
get connected devices ordered by how recently they were connected

Bug: 130984590
Test: Manual
Change-Id: Ie5d0c7a8e6bc5daad5ff14064b0c65b7c4c5e6b0
 2020-01-29 11:53:10 -08:00
Hansong Zhang
dfe0273968 Merge "Bluetooth LE COC: Delete unused testing API" 
am: 25983a0972

Change-Id: Iba4797930d442399b4078705b30eef07855dabee
 2020-01-24 16:22:26 -08:00
Hansong Zhang
a0b7355a6f Bluetooth LE COC: Delete unused testing API 
Some methods are for SL4A test only, and now they have been migrated.

Test: compile
Change-Id: I86e22814fc9a3fd296c359804a465b9ead4d926f
 2020-01-24 21:26:07 +00:00
Rahul Sabnis
f38016bdef Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" 
am: 4328fba884

Change-Id: I46a7f13edc552036fa7ee81144a794d750eaa3ca
 2020-01-22 22:05:14 -08:00
Treehugger Robot
4328fba884 Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" 2020-01-23 04:20:53 +00:00
Rahul Sabnis
30c597ffb0 Use @ConnectionPolicy annotation more consistently in classes with 
methods setConnectionPolicy and getConnectionPolicy

Bug: 147669289
Test: Manual
Change-Id: I2b9b0391a02d01623c1cd253f2da12b2baaea599
 2020-01-22 23:08:21 +00:00
Rahul Sabnis
264da33fe5 Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard" 
am: 23deb3367f

Change-Id: Iaab890dc9ebefabbcb7809fe2e83221f11d7d9f0
 2020-01-22 13:21:55 -08:00
Rahul Sabnis
5a607f2666 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" 
am: b4dbfff366

Change-Id: If06bce0f62fee4121c0e4445178c13458cd4b7c6
 2020-01-22 13:17:19 -08:00