diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-05 23:16:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-05 23:16:21 +0000 |
| commit | 95372e873e754affb25f89432e22035e86a0c123 (patch) | |
| tree | 33d7896d746bf4aa0e01d489d0023e572f7a6525 | |
| parent | 84bda3a7090622932790fa8ba68a91ecf8a17e23 (diff) | |
| parent | ee81f9915041875a8c9b6b71a39cb0508f6d7b22 (diff) | |
| download | base-95372e873e754affb25f89432e22035e86a0c123.tar.gz | |
Merge "Bluetooth: Use enums for adapter connection states"
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 9 | ||||
| -rw-r--r-- | core/proto/android/bluetooth/enums.proto | 30 |
2 files changed, 35 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index dc761521fbdc..be4e207e587d 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -537,13 +537,14 @@ public final class BluetoothAdapter { "android.bluetooth.adapter.action.BLE_ACL_DISCONNECTED"; /** The profile is in disconnected state */ - public static final int STATE_DISCONNECTED = 0; + public static final int STATE_DISCONNECTED = BluetoothProtoEnums.CONNECTION_STATE_DISCONNECTED; /** The profile is in connecting state */ - public static final int STATE_CONNECTING = 1; + public static final int STATE_CONNECTING = BluetoothProtoEnums.CONNECTION_STATE_CONNECTING; /** The profile is in connected state */ - public static final int STATE_CONNECTED = 2; + public static final int STATE_CONNECTED = BluetoothProtoEnums.CONNECTION_STATE_CONNECTED; /** The profile is in disconnecting state */ - public static final int STATE_DISCONNECTING = 3; + public static final int STATE_DISCONNECTING = + BluetoothProtoEnums.CONNECTION_STATE_DISCONNECTING; /** @hide */ public static final String BLUETOOTH_MANAGER_SERVICE = "bluetooth_manager"; diff --git a/core/proto/android/bluetooth/enums.proto b/core/proto/android/bluetooth/enums.proto new file mode 100644 index 000000000000..06ae2d3850d3 --- /dev/null +++ b/core/proto/android/bluetooth/enums.proto @@ -0,0 +1,30 @@ +/* + * Copyright 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +syntax = "proto2"; +package android.bluetooth; + +option java_outer_classname = "BluetoothProtoEnums"; +option java_multiple_files = true; + +// Bluetooth connection states. +// Primarily used by android/bluetooth/BluetoothAdapter.java +enum ConnectionStateEnum { + CONNECTION_STATE_DISCONNECTED = 0; + CONNECTION_STATE_CONNECTING = 1; + CONNECTION_STATE_CONNECTED = 2; + CONNECTION_STATE_DISCONNECTING = 3; +}
\ No newline at end of file |