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

Commit 803c2dc4 authored by Angela Wang's avatar Angela Wang Committed by Automerger Merge Worker
Browse files

Merge "API Review: support* methods should be supports*" am: 5e781fa5 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2325213



Change-Id: Ic064263ce44c8d54af9ad74f3a51822bdde82ffd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45858a05 5e781fa5

framework/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -266,10 +266,10 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setPresetName(@NonNull android.bluetooth.BluetoothDevice, int, @NonNull String);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setPresetNameForGroup(int, int, @NonNull String);

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

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

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

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

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

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

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

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

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void unregisterCallback(@NonNull android.bluetooth.BluetoothHapClient.Callback);

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_HAP_CONNECTION_STATE_CHANGED = "android.bluetooth.action.HAP_CONNECTION_STATE_CHANGED";

    field public static final int TYPE_BANDED = 2; // 0x2

framework/java/android/bluetooth/BluetoothHapClient.java

+4 −4
Original line number Diff line number Diff line
@@ -1271,7 +1271,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED

    })

    public boolean supportSynchronizedPresets(@NonNull BluetoothDevice device) {

    public boolean supportsSynchronizedPresets(@NonNull BluetoothDevice device) {

        return (getFeatures(device) & FEATURE_SYNCHRONIZATED_PRESETS_MASK)

                == FEATURE_SYNCHRONIZATED_PRESETS_MASK;

    }
@@ -1289,7 +1289,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED

    })

    public boolean supportIndependentPresets(@NonNull BluetoothDevice device) {

    public boolean supportsIndependentPresets(@NonNull BluetoothDevice device) {

        return (getFeatures(device) & FEATURE_INDEPENDENT_PRESETS_MASK)

                == FEATURE_INDEPENDENT_PRESETS_MASK;

    }
@@ -1307,7 +1307,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED

    })

    public boolean supportDynamicPresets(@NonNull BluetoothDevice device) {

    public boolean supportsDynamicPresets(@NonNull BluetoothDevice device) {

        return (getFeatures(device) & FEATURE_DYNAMIC_PRESETS_MASK)

                == FEATURE_DYNAMIC_PRESETS_MASK;

    }
@@ -1325,7 +1325,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED

    })

    public boolean supportWritablePresets(@NonNull BluetoothDevice device) {

    public boolean supportsWritablePresets(@NonNull BluetoothDevice device) {

        return (getFeatures(device) & FEATURE_WRITABLE_PRESETS_MASK)

                == FEATURE_WRITABLE_PRESETS_MASK;

    }