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

Commit 6a448095 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bt-cs-hal-v2" into main am: d60f7543 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3324176



Change-Id: I73af17166e57d6749ebe760a193f0216ef993901
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0525a8a3 d60f7543

bluetooth/ranging/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
include platform/packages/modules/Bluetooth:/OWNERS



chienyuanhuang@google.com

steveliu@google.com

bluetooth/ranging/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ aidl_interface { 
            imports: [],

        },

    ],

    frozen: true,

    frozen: false,



}

bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/BluetoothChannelSoundingParameters.aidl

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ parcelable BluetoothChannelSoundingParameters { 
  int aclHandle;

  int l2capCid;

  int realTimeProcedureDataAttHandle;

  /**

   * @deprecated use the role in Config.aidl

   */

  android.hardware.bluetooth.ranging.Role role;

  boolean localSupportsSoundingPhaseBasedRanging;

  boolean remoteSupportsSoundingPhaseBaseRanging;

bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/Ch3cShapeType.aidl

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

 * Copyright 2024 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.bluetooth.ranging;

@Backing(type="byte") @VintfStability

enum Ch3cShapeType {

  HAT_SHAPE = 0x00,

  X_SHAPE = 0x01,

}

bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSelectionType.aidl

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

 * Copyright 2024 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.bluetooth.ranging;

@Backing(type="byte") @VintfStability

enum ChannelSelectionType {

  ALOGRITHM_3B = 0x00,

  ALOGRITHM_3C = 0x01,

}