Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Use enums for adapter connection states"

Browse Source 
am: 95372e873e

Change-Id: Iab73a463f99de6113146b6541babe95b512ebbfa
This commit is contained in:
Jack He
2018-03-06 01:02:52 +00:00
committed by android-build-merger
parent f2fdc81f33 95372e873e
commit 8da4504cad
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -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";

30
core/proto/android/bluetooth/enums.proto Normal file
View File

@@ -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;
}