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

Commit c274bf47 authored by Bob Wang's avatar Bob Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topics "min-slot-duration",...

Merge changes from topics "min-slot-duration", "presubmit-am-9b6b545e139045589d95a07642d6096d" into tm-mainline-prod

* changes:
  [UWB HAL] Add new capability and reason code to show the channels that are capable for AoA.
  Add the unit of slot duration to its name.
parents 4c765444 e7613eb8
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,11 @@ aidl_interface {
            version: "1",
            version: "1",
            imports: [],
            imports: [],
        },
        },
        {
            version: "2",
            imports: [],
        },

    ],
    ],


}
}
+1 −0
Original line number Original line Diff line number Diff line
39791e3a4bb9892a340e94e44860048624d2f66e
+55 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2021 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.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.uwb.fira_android;
@Backing(type="int") @VintfStability
enum UwbVendorCapabilityTlvTypes {
  SUPPORTED_POWER_STATS_QUERY = 192,
  CCC_SUPPORTED_CHAPS_PER_SLOT = 160,
  CCC_SUPPORTED_SYNC_CODES = 161,
  CCC_SUPPORTED_HOPPING_CONFIG_MODES_AND_SEQUENCES = 162,
  CCC_SUPPORTED_CHANNELS = 163,
  CCC_SUPPORTED_VERSIONS = 164,
  CCC_SUPPORTED_UWB_CONFIGS = 165,
  CCC_SUPPORTED_PULSE_SHAPE_COMBOS = 166,
  CCC_SUPPORTED_RAN_MULTIPLIER = 167,
  CCC_SUPPORTED_MAX_RANGING_SESSION_NUMBER = 168,
  SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 227,
  SUPPORTED_MIN_RANGING_INTERVAL_MS = 228,
  SUPPORTED_RANGE_DATA_NTF_CONFIG = 229,
  SUPPORTED_RSSI_REPORTING = 230,
  SUPPORTED_DIAGNOSTICS = 231,
  SUPPORTED_MIN_SLOT_DURATION_MS = 232,
  SUPPORTED_MAX_RANGING_SESSION_NUMBER = 233,
  SUPPORTED_CHANNELS_AOA = 234,
}
+56 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2021 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.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.uwb.fira_android;
@Backing(type="long") @VintfStability
enum UwbVendorCapabilityTlvValues {
  UWB_CONFIG_0 = 0,
  UWB_CONFIG_1 = 1,
  PULSE_SHAPE_SYMMETRICAL_ROOT_RAISED_COSINE = 0,
  PULSE_SHAPE_PRECURSOR_FREE = 1,
  PULSE_SHAPE_PRECURSOR_FREE_SPECIAL = 2,
  CHAPS_PER_SLOT_3 = 1,
  CHAPS_PER_SLOT_4 = 2,
  CHAPS_PER_SLOT_6 = 4,
  CHAPS_PER_SLOT_8 = 8,
  CHAPS_PER_SLOT_9 = 16,
  CHAPS_PER_SLOT_12 = 32,
  CHAPS_PER_SLOT_24 = 64,
  HOPPING_SEQUENCE_DEFAULT = 16,
  HOPPING_SEQUENCE_AES = 8,
  HOPPING_CONFIG_MODE_NONE = 128,
  HOPPING_CONFIG_MODE_CONTINUOUS = 64,
  HOPPING_CONFIG_MODE_ADAPTIVE = 32,
  CCC_CHANNEL_5 = 1,
  CCC_CHANNEL_9 = 2,
}
+40 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2021 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.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.uwb.fira_android;
@Backing(type="byte") @VintfStability
enum UwbVendorGidAndroidOids {
  ANDROID_GET_POWER_STATS = 0,
  ANDROID_SET_COUNTRY_CODE = 1,
  ANDROID_RANGE_DIAGNOSTICS = 2,
}
Loading