commit 9986196c69f8016fb168d054d5fa98e68fecc0ee
author Lei Pi <ppipipi@google.com> Tue Sep 15 06:38:26 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 27 20:57:29 2020 +0000
tree d134564bdaa9ab02643d3cc950db98743cca480f
parent d3d59a00d861f9f7d014192ee7cd0d3e38df7ef5

hal: remove out_standby_l when usb headset is unplugged during playback of compress-offload

Remove the standby patch which was workaround for b/37551929 but impacting basic usecases.

Bug: 162394465
Test: Test music playback with and without usb headset.

Change-Id: I0c5e0ff162475f3958de79fa851018669edb4998
(cherry picked from commit 9e85e402af91048d21e94301dd153c9b681ff96e)

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 0f9dcf0..647f898 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2988,16 +2988,8 @@
 
         lock_output_stream(out);
 
-        // The usb driver needs to be closed after usb device disconnection
-        // otherwise audio is no longer played on the new usb devices.
-        // By forcing the stream in standby, the usb stack refcount drops to 0
-        // and the driver is closed.
         if (val == AUDIO_DEVICE_NONE &&
                 audio_is_usb_out_device(out->devices)) {
-            if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {
-                ALOGD("%s() putting the usb device in standby after disconnection", __func__);
-                out_standby_l(&out->stream.common);
-            }
             val = AUDIO_DEVICE_OUT_SPEAKER;
             forced_speaker_fallback = true;
         }