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

Commit 04621a3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "aoa_interleaving" 

* changes:
  uwb(hal): Remove getAndroidCapabilities HAL API
  uwb(hal): Add an android specifci aoa_result_req value
parents bd8229fc b44de009

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorCapabilityTlvTypes.aidl

+2 −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,
@@ -43,4 +44,5 @@ enum UwbVendorCapabilityTlvTypes { 
  CCC_SUPPORTED_CHANNELS = 166,

  CCC_SUPPORTED_HOPPING_SEQUENCES = 167,

  CCC_SUPPORTED_HOPPING_CONFIG_MODES = 168,

  SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 227,

}

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbAndroidCapabilities.aidl→uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorSessionAppConfigTlvValues.aidl

+3 −4
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ 
// 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,

  ANTENNAE_INTERLEAVING = 2,

@Backing(type="int") @VintfStability

enum UwbVendorSessionAppConfigTlvValues {

  AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 240,

}

uwb/aidl/aidl_api/android.hardware.uwb/current/android/hardware/uwb/IUwbChip.aidl

+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);

}

uwb/aidl/android/hardware/uwb/IUwbChip.aidl

+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

uwb/aidl/android/hardware/uwb/fira_android/UwbVendorCapabilityTlvTypes.aidl

+24 −0
Original line number Diff line number Diff line
@@ -29,6 +29,18 @@ package android.hardware.uwb.fira_android; 
@VintfStability

@Backing(type="int")

enum UwbVendorCapabilityTlvTypes {



    /*********************************************

     * Protocol agnostic

     ********************************************/

    /**

     * 1 byte value to indicate support for power stats query

     * Values:

     *  1 - Feature supported.

     *  0 - Feature not supported.

     */

    SUPPORTED_POWER_STATS_QUERY = 0xC0,



    /*********************************************

     * CCC specific

     ********************************************/
@@ -91,4 +103,16 @@ enum UwbVendorCapabilityTlvTypes { 
     *  HOPPING_CONFIG_MODE_ADAPTIVE = 2

     */

    CCC_SUPPORTED_HOPPING_CONFIG_MODES = 0xA8,



    /*********************************************

     * FIRA specific

     ********************************************/

    /**

     * 1 byte value to indicate support for antenna interleaving

     * feature.

     * Values:

     *  1 - Feature supported.

     *  0 - Feature not supported.

     */

    SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 0xE3,

}