diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-11 22:18:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-11 22:18:14 +0000 |
| commit | a4fda7e94ebd0bb22fcaad7bb023e7146604c9cc (patch) | |
| tree | 267c763130831d7465e73d9c29b2e6cbe57ea1f8 | |
| parent | e18f6439167cedc1e2cdebcf2c19df43718df8b3 (diff) | |
| parent | e3e480f7259b21f3ca54d7862270b8c9a0b1a863 (diff) | |
Merge "Fix duplicate status code" am: fab058791c am: de407f2d4a am: e3e480f725
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1976759
Change-Id: I154a8ce2698fb18d2c1d2764b9bc29702120cce9
| -rw-r--r-- | framework/api/system-current.txt | 2 | ||||
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothStatusCodes.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index dda0d35292..339223a165 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -672,7 +672,7 @@ package android.bluetooth { field public static final int ERROR_PROFILE_NOT_CONNECTED = 14; // 0xe 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 diff --git a/framework/java/android/bluetooth/BluetoothStatusCodes.java b/framework/java/android/bluetooth/BluetoothStatusCodes.java index 8825c3e71b..ebaace621b 100644 --- a/framework/java/android/bluetooth/BluetoothStatusCodes.java +++ b/framework/java/android/bluetooth/BluetoothStatusCodes.java @@ -227,7 +227,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. |