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

Commit e3e480f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix duplicate status code" am: fab05879 am: de407f2d 

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

Change-Id: I2ecc9a33ea68f8eb27fa43d5ba9f58d3a1c2a1a7
parents bac43c0d de407f2d

framework/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ package android.bluetooth { 
    field public static final int ERROR_LOCAL_NOT_ENOUGH_RESOURCES = 22; // 0x16

    field public static final int ERROR_REMOTE_LINK_ERROR = 25; // 0x19

    field public static final int ERROR_REMOTE_NOT_ENOUGH_RESOURCES = 23; // 0x17

    field public static final int ERROR_REMOTE_OPERATION_NOT_SUPPORTED = 24; // 0x18

    field public static final int ERROR_REMOTE_OPERATION_NOT_SUPPORTED = 27; // 0x1b

    field public static final int ERROR_REMOTE_OPERATION_REJECTED = 24; // 0x18

    field public static final int ERROR_TIMEOUT = 15; // 0xf

    field public static final int NOT_ALLOWED = 401; // 0x191

framework/java/android/bluetooth/BluetoothStatusCodes.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public final class BluetoothStatusCodes { 
     * @hide

     */

    @SystemApi

    public static final int ERROR_REMOTE_OPERATION_NOT_SUPPORTED = 24;

    public static final int ERROR_REMOTE_OPERATION_NOT_SUPPORTED = 27;



    /**

     * A GATT writeCharacteristic request is not permitted on the remote device.