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

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

Merge changes from topic "presubmit-am-59c02c23dbb842959140ace7fcb0e752" into udc-dev 

* changes:
  [automerge] Add new reason code and status code for session conflict. 2p: fbe75bbc
  Add new reason code and status code for session conflict.
parents 314f40bf 1c2d1bda

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

+2 −1
Original line number Diff line number Diff line
@@ -35,5 +35,6 @@ package android.hardware.uwb.fira_android; 
@Backing(type="int") @VintfStability

enum UwbVendorReasonCodes {

  REASON_ERROR_INVALID_CHANNEL_WITH_AOA = 128,

  REASON_REGULATION_UWB_OFF = 129,

  REASON_ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 129,

  REASON_REGULATION_UWB_OFF = 130,

}

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

+2 −1
Original line number Diff line number Diff line
@@ -36,5 +36,6 @@ package android.hardware.uwb.fira_android; 
enum UwbVendorStatusCodes {

  STATUS_ERROR_CCC_SE_BUSY = 80,

  STATUS_ERROR_CCC_LIFECYCLE = 81,

  STATUS_REGULATION_UWB_OFF = 82,

  STATUS_ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 82,

  STATUS_REGULATION_UWB_OFF = 83,

}

uwb/aidl/android/hardware/uwb/fira_android/UwbVendorReasonCodes.aidl

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ enum UwbVendorReasonCodes { 
    /** Fira specific */

    /** The channel requested is not available for AoA */

    REASON_ERROR_INVALID_CHANNEL_WITH_AOA = 0x80,

    /** UWB stopped caused by other session conflict */

    REASON_ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 0x81,

    /** UWB has been disabled (eg: country code change leads to UWB unsupported) */

    REASON_REGULATION_UWB_OFF = 0x81,

    REASON_REGULATION_UWB_OFF = 0x82,

}

uwb/aidl/android/hardware/uwb/fira_android/UwbVendorStatusCodes.aidl

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ enum UwbVendorStatusCodes { 
    STATUS_ERROR_CCC_SE_BUSY = 0x50,

    /** CCC Lifecycle error */

    STATUS_ERROR_CCC_LIFECYCLE = 0x51,

    /** Other session conflict */

    STATUS_ERROR_STOPPED_DUE_TO_OTHER_SESSION_CONFLICT = 0x52,

    /** UWB Regulation Off */

    STATUS_REGULATION_UWB_OFF = 0x52,

    STATUS_REGULATION_UWB_OFF = 0x53,

}