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

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

Merge changes from topic "duration-unit" into udc-dev 

* changes:
  [automerge] Change the unit of slot duration from ms to rstu. 2p: 40bc0404
  Change the unit of slot duration from ms to rstu.
parents 4a7a06fa 732b7492

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/2/.hash

+1 −1
Original line number Diff line number Diff line 
39791e3a4bb9892a340e94e44860048624d2f66e
 
590d9f45625a2c353011cf85f18d1d08593b8a0a

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ enum UwbVendorCapabilityTlvTypes { 
  SUPPORTED_RANGE_DATA_NTF_CONFIG = 229,

  SUPPORTED_RSSI_REPORTING = 230,

  SUPPORTED_DIAGNOSTICS = 231,

  SUPPORTED_MIN_SLOT_DURATION_MS = 232,

  SUPPORTED_MIN_SLOT_DURATION_RSTU = 232,

  SUPPORTED_MAX_RANGING_SESSION_NUMBER = 233,

  SUPPORTED_CHANNELS_AOA = 234,

}

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ enum UwbVendorCapabilityTlvTypes { 
  SUPPORTED_RANGE_DATA_NTF_CONFIG = 229,

  SUPPORTED_RSSI_REPORTING = 230,

  SUPPORTED_DIAGNOSTICS = 231,

  SUPPORTED_MIN_SLOT_DURATION_MS = 232,

  SUPPORTED_MIN_SLOT_DURATION_RSTU = 232,

  SUPPORTED_MAX_RANGING_SESSION_NUMBER = 233,

  SUPPORTED_CHANNELS_AOA = 234,

}

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

+2 −2
Original line number Diff line number Diff line
@@ -186,9 +186,9 @@ enum UwbVendorCapabilityTlvTypes { 
    SUPPORTED_DIAGNOSTICS = 0xE7,



    /**

     * 4 byte value to indicate supported min slot duration in ms.

     * 4 byte value to indicate supported min slot duration in rstu.

     */

    SUPPORTED_MIN_SLOT_DURATION_MS = 0xE8,

    SUPPORTED_MIN_SLOT_DURATION_RSTU = 0xE8,



    /**

     * Int value to indicate supported max number of fira ranging sessions