commit 9e85e402af91048d21e94301dd153c9b681ff96e
author Lei Pi <ppipipi@google.com> Tue Sep 15 06:38:26 2020 +0000
committer Bubble Fang <bubblefang@google.com> Sun Sep 20 13:33:45 2020 +0000
tree 7fca6ed12af1be332b4724291a2a2e2f4a15e7cc
parent 16240d402be8ad6c76c97e464677ba2bc1975c36

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

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index b62da23..a3abb8a 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2994,16 +2994,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;
         }