4 files changed, 10 insertions, 2 deletions
diff --git a/audio_a2dp_hw/include/audio_a2dp_hw.h b/audio_a2dp_hw/include/audio_a2dp_hw.h
index 0d95c1b5b..fd92ee31a 100644
--- a/audio_a2dp_hw/include/audio_a2dp_hw.h
+++ b/audio_a2dp_hw/include/audio_a2dp_hw.h
@@ -139,7 +139,8 @@ typedef enum {
   A2DP_CTRL_ACK_PENDING,
   A2DP_CTRL_ACK_LONG_WAIT_ERR,
   A2DP_CTRL_ACK_UNKNOWN,
-  A2DP_CTRL_ACK_STREAM_SUSPENDED
+  A2DP_CTRL_ACK_STREAM_SUSPENDED,
+  A2DP_CTRL_ACK_SHORT_WAIT_ERR,
 } tA2DP_CTRL_ACK;
 
 typedef uint32_t tA2DP_SAMPLE_RATE;
diff --git a/audio_hal_interface/a2dp_encoding.cc b/audio_hal_interface/a2dp_encoding.cc
index 2dffdb89b..b800e2803 100644
--- a/audio_hal_interface/a2dp_encoding.cc
+++ b/audio_hal_interface/a2dp_encoding.cc
@@ -407,6 +407,8 @@ BluetoothAudioCtrlAck a2dp_ack_to_bt_audio_ctrl_ack(tA2DP_CTRL_ACK ack) {
       return BluetoothAudioCtrlAck::FAILURE;
     case A2DP_CTRL_ACK_LONG_WAIT_ERR:
       return BluetoothAudioCtrlAck::FAILURE_LONG_WAIT;
+    case A2DP_CTRL_ACK_SHORT_WAIT_ERR:
+      return BluetoothAudioCtrlAck::FAILURE_SHORT_WAIT;
     default:
       return BluetoothAudioCtrlAck::FAILURE;
   }
diff --git a/audio_hal_interface/client_interface.cc b/audio_hal_interface/client_interface.cc
index 480db4d29..0068b4a0e 100644
--- a/audio_hal_interface/client_interface.cc
+++ b/audio_hal_interface/client_interface.cc
@@ -63,6 +63,8 @@ std::ostream& operator<<(std::ostream& os, const BluetoothAudioCtrlAck& ack) {
       return os << "FAILURE";
     case BluetoothAudioCtrlAck::FAILURE_LONG_WAIT:
       return os << "FAILURE_LONG_WAIT";
+    case BluetoothAudioCtrlAck::FAILURE_SHORT_WAIT:
+      return os << "FAILURE_SHORT_WAIT";
     default:
       return os << "UNDEFINED " << static_cast<int8_t>(ack);
   }
diff --git a/audio_hal_interface/client_interface.h b/audio_hal_interface/client_interface.h
index 859ac86cc..981fd37f1 100644
--- a/audio_hal_interface/client_interface.h
+++ b/audio_hal_interface/client_interface.h
@@ -72,7 +72,8 @@ enum class BluetoothAudioCtrlAck : uint8_t {
   FAILURE_BUSY,
   FAILURE_DISCONNECTING,
   FAILURE,
-  FAILURE_LONG_WAIT
+  FAILURE_LONG_WAIT,
+  FAILURE_SHORT_WAIT,
 };
 
 std::ostream& operator<<(std::ostream& os, const BluetoothAudioCtrlAck& ack);
@@ -92,6 +93,8 @@ inline BluetoothAudioStatus BluetoothAudioCtrlAckToHalStatus(
       return BluetoothAudioStatus::FAILURE_DISC_IN_PROGRESS;
     case BluetoothAudioCtrlAck::FAILURE_LONG_WAIT:
       return BluetoothAudioStatus::LW_ERROR;
+    case BluetoothAudioCtrlAck::FAILURE_SHORT_WAIT:
+      return BluetoothAudioStatus::SW_ERROR;
     default:
       return BluetoothAudioStatus::FAILURE;
   }