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

Commit 5aef5c65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I94d15307,I7deb8556,I755b3140 

* changes:
  Atom: Add more Bluetooth atoms
  Atom: Add A2DP playback related atoms to StatsLog
  Fix typo in hci/enums.proto: OCCURED -> OCCURRED
parents d8148b6c 4d6abe65

cmds/statsd/src/atoms.proto

+550 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/proto/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ cc_library_static { 
        type: "lite",

    },

    srcs: [

        "android/bluetooth/a2dp/enums.proto",

        "android/bluetooth/enums.proto",

        "android/bluetooth/hci/enums.proto",

        "android/bluetooth/hfp/enums.proto",

        "android/bluetooth/smp/enums.proto",

    ],

}

core/proto/android/bluetooth/a2dp/enums.proto

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * 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.a2dp;



option java_outer_classname = "BluetoothA2dpProtoEnums";

option java_multiple_files = true;



// A2dp playback state enum, defined from:

// frameworks/base/core/java/android/bluetooth/BluetoothA2dp.java

enum PlaybackStateEnum {

    PLAYBACK_STATE_UNKNOWN = 0;

    PLAYBACK_STATE_PLAYING = 10;

    PLAYBACK_STATE_NOT_PLAYING = 11;

}



enum AudioCodingModeEnum {

    AUDIO_CODING_MODE_UNKNOWN = 0;

    AUDIO_CODING_MODE_HARDWARE = 1;

    AUDIO_CODING_MODE_SOFTWARE = 2;

}

core/proto/android/bluetooth/enums.proto

+54 −0
Original line number Diff line number Diff line
@@ -56,3 +56,57 @@ enum LinkTypeEnum { 
    LINK_TYPE_ACL = 0x01;

    LINK_TYPE_ESCO = 0x02;

}



enum DeviceInfoSrcEnum {

    DEVICE_INFO_SRC_UNKNOWN = 0;

    // Within Android Bluetooth stack

    DEVICE_INFO_INTERNAL = 1;

    // Outside Android Bluetooth stack

    DEVICE_INFO_EXTERNAL = 2;

}



enum DeviceTypeEnum {

    DEVICE_TYPE_UNKNOWN = 0;

    DEVICE_TYPE_CLASSIC = 1;

    DEVICE_TYPE_LE = 2;

    DEVICE_TYPE_DUAL = 3;

}



// Defined in frameworks/base/core/java/android/bluetooth/BluetoothDevice.java

enum TransportTypeEnum {

    TRANSPORT_TYPE_AUTO = 0;

    TRANSPORT_TYPE_BREDR = 1;

    TRANSPORT_TYPE_LE = 2;

}



// Bond state enum

// Defined in frameworks/base/core/java/android/bluetooth/BluetoothDevice.java

enum BondStateEnum {

    BOND_STATE_UNKNOWN = 0;

    BOND_STATE_NONE = 10;

    BOND_STATE_BONDING = 11;

    BOND_STATE_BONDED = 12;

}



// Sub states within the bonding general state

enum BondSubStateEnum {

    BOND_SUB_STATE_UNKNOWN = 0;

    BOND_SUB_STATE_LOCAL_OOB_DATA_PROVIDED = 1;

    BOND_SUB_STATE_LOCAL_PIN_REQUESTED = 2;

    BOND_SUB_STATE_LOCAL_PIN_REPLIED = 3;

    BOND_SUB_STATE_LOCAL_SSP_REQUESTED = 4;

    BOND_SUB_STATE_LOCAL_SSP_REPLIED = 5;

}



enum UnbondReasonEnum {

    UNBOND_REASON_UNKNOWN = 0;

    UNBOND_REASON_AUTH_FAILED = 1;

    UNBOND_REASON_AUTH_REJECTED = 2;

    UNBOND_REASON_AUTH_CANCELED = 3;

    UNBOND_REASON_REMOTE_DEVICE_DOWN = 4;

    UNBOND_REASON_DISCOVERY_IN_PROGRESS = 5;

    UNBOND_REASON_AUTH_TIMEOUT = 6;

    UNBOND_REASON_REPEATED_ATTEMPTS = 7;

    UNBOND_REASON_REMOTE_AUTH_CANCELED = 8;

    UNBOND_REASON_REMOVED = 9;

}

core/proto/android/bluetooth/hci/enums.proto

+41 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ enum EventEnum { 
    EVT_COMMAND_COMPLETE = 0x0E;

    EVT_COMMAND_STATUS = 0x0F;

    EVT_HARDWARE_ERROR = 0x10;

    EVT_FLUSH_OCCURED = 0x11;

    EVT_FLUSH_OCCURRED = 0x11;

    EVT_ROLE_CHANGE = 0x12;

    EVT_NUM_COMPL_DATA_PKTS = 0x13;

    EVT_MODE_CHANGE = 0x14;
@@ -517,3 +517,43 @@ enum StatusEnum { 
    STATUS_CLB_DATA_TOO_BIG = 0x43;

    STATUS_OPERATION_CANCELED_BY_HOST = 0x44; // Not currently used in system/bt

}



enum BqrIdEnum {

    BQR_ID_UNKNOWN = 0x00;

    BQR_ID_MONITOR_MODE = 0x01;

    BQR_ID_APPROACH_LSTO = 0x02;

    BQR_ID_A2DP_AUDIO_CHOPPY = 0x03;

    BQR_ID_SCO_VOICE_CHOPPY = 0x04;

}



enum BqrPacketTypeEnum {

    BQR_PACKET_TYPE_UNKNOWN = 0x00;

    BQR_PACKET_TYPE_ID = 0x01;

    BQR_PACKET_TYPE_NULL = 0x02;

    BQR_PACKET_TYPE_POLL = 0x03;

    BQR_PACKET_TYPE_FHS = 0x04;

    BQR_PACKET_TYPE_HV1 = 0x05;

    BQR_PACKET_TYPE_HV2 = 0x06;

    BQR_PACKET_TYPE_HV3 = 0x07;

    BQR_PACKET_TYPE_DV = 0x08;

    BQR_PACKET_TYPE_EV3 = 0x09;

    BQR_PACKET_TYPE_EV4 = 0x0A;

    BQR_PACKET_TYPE_EV5 = 0x0B;

    BQR_PACKET_TYPE_2EV3 = 0x0C;

    BQR_PACKET_TYPE_2EV5 = 0x0D;

    BQR_PACKET_TYPE_3EV3 = 0x0E;

    BQR_PACKET_TYPE_3EV5 = 0x0F;

    BQR_PACKET_TYPE_DM1 = 0x10;

    BQR_PACKET_TYPE_DH1 = 0x11;

    BQR_PACKET_TYPE_DM3 = 0x12;

    BQR_PACKET_TYPE_DH3 = 0x13;

    BQR_PACKET_TYPE_DM5 = 0x14;

    BQR_PACKET_TYPE_DH5 = 0x15;

    BQR_PACKET_TYPE_AUX1 = 0x16;

    BQR_PACKET_TYPE_2DH1 = 0x17;

    BQR_PACKET_TYPE_2DH3 = 0x18;

    BQR_PACKET_TYPE_2DH5 = 0x19;

    BQR_PACKET_TYPE_3DH1 = 0x1A;

    BQR_PACKET_TYPE_3DH3 = 0x1B;

    BQR_PACKET_TYPE_3DH5 = 0x1C;

}