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

Commit b44de009 authored by Roshan Pius's avatar Roshan Pius
Browse files

uwb(hal): Remove getAndroidCapabilities HAL API

This is unnecessary since we are anyway using GET_CAPS_INFO for querying
non-fira capabilities.

Bug: 208678993
Bug: 209053358
Test: Compiles
Change-Id: Id9af03b313ceaf00fb6d5231c454dc7c74a6287a
parent 5ea2d179
Loading
Loading
Loading
Loading
+0 −39
Original line number 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 UwbAndroidCapabilities {
  POWER_STATS_QUERY = 1,
  ANTENNA_INTERLEAVING = 2,
}
+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@
package android.hardware.uwb.fira_android;
@Backing(type="int") @VintfStability
enum UwbVendorCapabilityTlvTypes {
  SUPPORTED_POWER_STATS_QUERY = 192,
  CCC_SUPPORTED_VERSIONS = 160,
  CCC_SUPPORTED_UWB_CONFIGS = 161,
  CCC_SUPPORTED_PULSE_SHAPE_COMBOS = 162,
+0 −1
Original line number Diff line number Diff line
@@ -42,6 +42,5 @@ interface IUwbChip {
  void coreInit();
  void sessionInit(int sessionId);
  int getSupportedAndroidUciVersion();
  long getSupportedAndroidCapabilities();
  int sendUciMessage(in byte[] data);
}
+0 −10
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ interface IUwbChip {
     */
    int getSupportedAndroidUciVersion();

    /**
     * Mechanism to allow HAL implementation to optionally expose features that are defined
     * in the "android.hardware.uwb.fira_android" types-only package.
     *
     * @return Returns the bitmask of capabilities
     * (android.hardware.uwb.fira_android.UwbAndroidCapabilities) that is supported by the
     * HAL implementation.
     */
    long getSupportedAndroidCapabilities();

    /**
     * Write the UCI message to the UWB Subsystem.
     * The UCI message format is as per UCI  protocol and it is
+0 −31
Original line number 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.
 */

package android.hardware.uwb.fira_android;

/**
 * Android specific capabilities should be defined here.
 *
 * For any features enabled via the FIRA vendor commands for Android, use this bitmask
 * to allow devices to expose the features supported by the HAL implementation.
 *
 */
@VintfStability
@Backing(type="long")
enum UwbAndroidCapabilities {
    POWER_STATS_QUERY = 0x1,
    ANTENNA_INTERLEAVING = 0x2,
}
Loading