From eab909573be728b395699d42e2d9a79a09726eaa Mon Sep 17 00:00:00 2001
From: HW Lee <hwlee@google.com>
Date: Wed, 21 Apr 2021 02:25:26 +0000
Subject: [PATCH 1/2] audio: remove unsupported TinyALSA controls

Bug: 185443616
Test: build pass
Signed-off-by: HW Lee <hwlee@google.com>
Change-Id: I84abb4a1d59ff8344d7fc308be7f82c21b591b00
---
 audio/oriole/config/mixer_paths_factory.xml   | 1 -
 audio/raven/config/mixer_paths_factory.xml    | 1 -
 audio/slider/config/mixer_paths_factory.xml   | 1 -
 audio/whitefin/config/mixer_paths_factory.xml | 1 -
 4 files changed, 4 deletions(-)

diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index ccc078c..93aa2f9 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index ccc078c..93aa2f9 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml
index cad5bd1..da25109 100644
--- a/audio/slider/config/mixer_paths_factory.xml
+++ b/audio/slider/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">
diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml
index cad5bd1..da25109 100644
--- a/audio/whitefin/config/mixer_paths_factory.xml
+++ b/audio/whitefin/config/mixer_paths_factory.xml
@@ -18,7 +18,6 @@
     <ctl name="MIC3" value="0" />
 
     <path name="mfg-playback">
-        <ctl name="PCM Playback Switch" value="1" />
     </path>
 
     <path name="deep-buffer-playback speaker">

From 0bc47d654b05e8208ba7ef8cf8db463ac28fe879 Mon Sep 17 00:00:00 2001
From: Victor Liu <victorliu@google.com>
Date: Tue, 20 Apr 2021 22:15:02 +0000
Subject: [PATCH 2/2] Revert "device: don't build uwb"

This reverts commit 7357dbcb595d688aede6affc72715366cb4f206e.

Reason for revert: Fixed uwb service crash
Test: flash on raven, verify uwb service is idle, unplug usb
Change-Id: I2f3a3a73d16e8a282fdbb171bf60ad2cafa0d7c5
---
 device-raven.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device-raven.mk b/device-raven.mk
index 6d9f26d..8ef95c3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -27,6 +27,9 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
 
 include device/google/gs101/device-shipping-common.mk
 include device/google/gs101/fingerprint/udfps.mk
+ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
+include device/google/gs101/uwb/uwb.mk
+endif
 include device/google/raviole/audio/raven/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk