Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37142033 authored by William Escande's avatar William Escande
Browse files

Fix some API recently added 

Bug: 217352944
Test: atest BluetoothHostTest#testAdapterGetConnectionState
Test: atest BluetoothHostTest#testAdapterGetMostRecentlyConnectedDevices
Test: atest BluetoothHostTest#testAdapterGetUuids
Test: atest BluetoothHostTest#testAdapterNameForState
Test: atest BluetoothHostTest#testAdapterRegisterBluetoothConnectionCallback
Test: atest BluetoothHostTest#testAdapterRegisterServiceLifecycleCallback
Test: atest BluetoothHostTest#testAdapterRequestControllerActivityEnergyInfo
Tag: #refactor
Merged-In: If90840d37d41cead376edeff946e552eab5bae85
Change-Id: If90840d37d41cead376edeff946e552eab5bae85
CTS-Coverage-Bug: 217352944
parent 3f38e428

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −0
Original line number Diff line number Diff line
@@ -2049,6 +2049,8 @@ public class AdapterService extends Service { 
                return new ArrayList<>();

            }



            enforceBluetoothPrivilegedPermission(service);



            return service.mDatabaseManager.getMostRecentlyConnectedDevices();

        }

framework/api/system-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public long getDiscoveryEndMillis();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getMostRecentlyConnectedDevices();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<java.lang.Integer> getSupportedProfiles();

    method @NonNull @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelUuid[] getUuids();

    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelUuid[] getUuids();

    method public boolean isBleScanAlwaysAvailable();

    method public boolean isLeEnabled();

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static String nameForState(int);

    method @NonNull public static String nameForState(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean registerBluetoothConnectionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback);

    method public boolean registerServiceLifecycleCallback(@NonNull android.bluetooth.BluetoothAdapter.ServiceLifecycleCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean removeActiveDevice(int);
@@ -78,6 +78,8 @@ package android.bluetooth { 
    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BluetoothSocket retrieveConnectedRfcommSocket(@NonNull java.util.UUID);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setActiveDevice(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startRfcommServer(@NonNull String, @NonNull java.util.UUID, @NonNull android.app.PendingIntent);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean unregisterBluetoothConnectionCallback(@NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback);

    method public void unregisterServiceLifecycleCallback(@NonNull android.bluetooth.BluetoothAdapter.ServiceLifecycleCallback);

    field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED";

    field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_REQUEST_DISABLE = "android.bluetooth.adapter.action.REQUEST_DISABLE";

framework/java/android/bluetooth/BluetoothAdapter.java

+7 −4
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ public final class BluetoothAdapter { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresNoPermission

    @NonNull

    public static String nameForState(@AdapterState int state) {

        switch (state) {
@@ -1440,7 +1440,6 @@ public final class BluetoothAdapter { 
    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @NonNull

    @SuppressLint(value = {"ArrayReturn", "NullableCollection"})

    public @Nullable ParcelUuid[] getUuids() {

        if (getState() != STATE_ON) {
@@ -4143,6 +4142,7 @@ public final class BluetoothAdapter { 
     *

     * @hide

     */

    @RequiresNoPermission

    @SystemApi

    public boolean registerServiceLifecycleCallback(@NonNull ServiceLifecycleCallback callback) {

        return getBluetoothService(callback.mRemote) != null;
@@ -4153,7 +4153,9 @@ public final class BluetoothAdapter { 
     *

     * @hide

     */

    public void unregisterServiceLifecycleCallback(ServiceLifecycleCallback callback) {

    @RequiresNoPermission

    @SystemApi

    public void unregisterServiceLifecycleCallback(@NonNull ServiceLifecycleCallback callback) {

        removeServiceStateCallback(callback.mRemote);

    }
@@ -4647,7 +4649,7 @@ public final class BluetoothAdapter { 
    public boolean registerBluetoothConnectionCallback(@NonNull @CallbackExecutor Executor executor,

            @NonNull BluetoothConnectionCallback callback) {

        if (DBG) Log.d(TAG, "registerBluetoothConnectionCallback()");

        if (callback == null) {

        if (callback == null || executor == null) {

            return false;

        }
@@ -4690,6 +4692,7 @@ public final class BluetoothAdapter { 
     * @return true if the callback was unregistered successfully, false otherwise

     * @hide

     */

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,