commit 22eb029a3b42c22c31beac0b03c1d732344a9e0a
author Haynes Mathew George <hgeorge@codeaurora.org> Thu Aug 10 03:29:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 03:29:59 2017 +0000
tree 400c70791a5dff7a9f24a7292919643fb336713e
parent 6fc7f8fe07af0019639eae433450ef55317f160e
parent 82628456f64e89e36597ac601ac23762661d30ef

Merge "audio: Force select device whenever a stream on speaker_safe goes to standby" into oc-dr1-dev
am: 82628456f6

Change-Id: I6d9f78b95339b61dda1d2d442ba2cb711f17862e

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 49eacb0..32f2def 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1801,6 +1801,15 @@
     /* Must be called after removing the usecase from list */
     if (out->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)
         check_and_set_hdmi_channels(adev, DEFAULT_HDMI_OUT_CHANNELS);
+    else if (out->devices & AUDIO_DEVICE_OUT_SPEAKER_SAFE) {
+        struct listnode *node;
+        struct audio_usecase *usecase;
+        list_for_each(node, &adev->usecase_list) {
+            usecase = node_to_item(node, struct audio_usecase, list);
+            if (usecase->devices & AUDIO_DEVICE_OUT_SPEAKER)
+                select_devices(adev, usecase->id);
+        }
+    }
 
     ALOGV("%s: exit: status(%d)", __func__, ret);
     return ret;