commit 2f7f279e529e5671854c9ec8bb26e34a477c1b78
author Yuyang Huang <yuyangh@google.com> Wed Aug 07 23:02:59 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 07 23:02:59 2024 +0000
tree f33f7e3b222f13226d200fa20e7b6ebdbc1998d6
parent 0eddf3322c4d07910c62dfed03297d7ef8c657f0
parent 9daf187ec6a87367de6958ebdcd028167122d4f1

improve condition check for LE audio session am: 9daf187ec6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3212555

Change-Id: I2bbc7c128001f4c7d31200c7bc349d586bae7278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp

diff --git a/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp b/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp
index d0f2a26..4fe2b37 100644
--- a/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp
+++ b/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp
@@ -145,15 +145,18 @@
       return;
     }
   } else {
-    if (session_type_ !=
-            SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH &&
-        session_type_ !=
+    if (session_type_ ==
+            SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH ||
+        session_type_ ==
             SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH) {
-      return;
-    }
-    if (audio_config.getTag() != AudioConfiguration::leAudioConfig) {
-      LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="
-                 << toString(session_type_);
+      if (audio_config.getTag() != AudioConfiguration::leAudioConfig) {
+        LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="
+                   << toString(session_type_);
+        return;
+      }
+    } else {
+      LOG(ERROR) << __func__
+                 << " invalid SessionType =" << toString(session_type_);
       return;
     }
   }