| commit | 10968ffc78821873ba92332d6a498f0af78112c0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Jun 30 01:04:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 30 01:04:28 2022 +0000 |
| tree | 6c6d4114e1801d511941a606ba2f86a850d0e5eb | |
| parent | 83e60e540c04b708262075817036e1352887387f [diff] | |
| parent | fd8704617101330208ec30b66eb6fe5310ac522c [diff] |
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 7c0bc319e9 -s ours am: 4849805f97 -s ours am: ef4929fa89 -s ours am: fd87046171 -s ours am skip reason: Merged-In If82a5bf302cb68a2c5b486006e4679fbfc8ee545 with SHA-1 3493565708 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/19094441 Change-Id: Id4f03b66bc938538eec5106dd338e0e0185cb366 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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); }