commit 3fa2250d943ad212fa3d1fe462da4c125b0c7008
author Xin Li <delphij@google.com> Wed Aug 17 06:42:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 17 06:42:32 2022 +0000
tree f3eb6861c0e838eac215a629bb1a5bd053ff6954
parent ebe158d87110959e49b53522d598a02c7531dcb4
parent 17346ff4b5dc4e354adb767e61c58b6578be4886

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s ours am: a40a523408 -s ours am: 1a5ba00f6e -s ours am: 17346ff4b5 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2186752

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

modules/usbaudio/audio_hal.c

diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c
index fe921d6..616c4a6 100644
--- a/modules/usbaudio/audio_hal.c
+++ b/modules/usbaudio/audio_hal.c
@@ -1723,10 +1723,16 @@
     if (!wasStandby) {
         device_lock(adev);
         if (in != NULL) {
-            start_input_stream(in);
+            ret = start_input_stream(in);
+            if (!ret) {
+                in->standby = false;
+            }
         }
         if (out != NULL) {
-            start_output_stream(out);
+            ret = start_output_stream(out);
+            if (!ret) {
+                out->standby = false;
+            }
         }
         device_unlock(adev);
     }