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

Commit d6c80430 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "BluetoothGatt: Deprecate unsupported methods" am: e4a79de8 am: c57b0835 am: 1e4ab066 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899033

Change-Id: I171735ba4e583455c3070f30662bf505cd4facc3
parents 8106c138 1e4ab066

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -9185,10 +9185,10 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void disconnect();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean discoverServices();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean executeReliableWrite();

    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();

    method public int getConnectionState(android.bluetooth.BluetoothDevice);

    method @Deprecated public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();

    method @Deprecated public int getConnectionState(android.bluetooth.BluetoothDevice);

    method public android.bluetooth.BluetoothDevice getDevice();

    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);

    method @Deprecated public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);

    method public android.bluetooth.BluetoothGattService getService(java.util.UUID);

    method public java.util.List<android.bluetooth.BluetoothGattService> getServices();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readCharacteristic(android.bluetooth.BluetoothGattCharacteristic);

core/java/android/bluetooth/BluetoothGatt.java

+6 −4
Original line number Diff line number Diff line
@@ -1806,32 +1806,33 @@ public final class BluetoothGatt implements BluetoothProfile { 
    }



    /**

     * Not supported - please use {@link BluetoothManager#getConnectedDevices(int)}

     * @deprecated Not supported - please use {@link BluetoothManager#getConnectedDevices(int)}

     * with {@link BluetoothProfile#GATT} as argument

     *

     * @throws UnsupportedOperationException

     */

    @Override

    @RequiresNoPermission

    @Deprecated

    public int getConnectionState(BluetoothDevice device) {

        throw new UnsupportedOperationException("Use BluetoothManager#getConnectionState instead.");

    }



    /**

     * Not supported - please use {@link BluetoothManager#getConnectedDevices(int)}

     * @deprecated Not supported - please use {@link BluetoothManager#getConnectedDevices(int)}

     * with {@link BluetoothProfile#GATT} as argument

     *

     * @throws UnsupportedOperationException

     */

    @Override

    @RequiresNoPermission

    @Deprecated

    public List<BluetoothDevice> getConnectedDevices() {

        throw new UnsupportedOperationException(

                "Use BluetoothManager#getConnectedDevices instead.");

    }



    /**

     * Not supported - please use

     * @deprecated Not supported - please use

     * {@link BluetoothManager#getDevicesMatchingConnectionStates(int, int[])}

     * with {@link BluetoothProfile#GATT} as first argument

     *
@@ -1839,6 +1840,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
     */

    @Override

    @RequiresNoPermission

    @Deprecated

    public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {

        throw new UnsupportedOperationException(

                "Use BluetoothManager#getDevicesMatchingConnectionStates instead.");