From 290d454b4c6c7ba2b4e829e866b423410e78b231 Mon Sep 17 00:00:00 2001
From: Long Ling <longling@google.com>
Date: Tue, 13 Dec 2022 11:09:09 -0800
Subject: [PATCH 1/3] preload default smooth display regamma data

Bug: 260029084
Change-Id: I55c284efe710caaaa5a33955c4cfeb39b59168b0
---
 felix/display_colordata_dev_cal1.pb | Bin 131 -> 578 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/felix/display_colordata_dev_cal1.pb b/felix/display_colordata_dev_cal1.pb
index 35494f224bbf3825f0d1756f73a48e19af713a3a..fdbdb17c5add2149e7b9acace690935fefb170fb 100644
GIT binary patch
literal 578
zcmd7MO-{m400dxPAGD=~wv@kDeqY>Z8WN##L0pLom+BQT7Gi>s2qwClrSSxM0QCay
zorUKTNq63W*~~Y)an5ZK2rXi7HMv_oEN1<5G8&GO#2fs}Ni<6r>HTD#-stNmy_`<x
zw~JJ-m&^H?yf_-~k7Lt*3?g-q^`W|qt?j;2uOha$coXVfX8Mro+ss5${koYpuG;v?
zmvro5GUyKn$#M88ofqL4K}kc$5PPT3;zz)s0ZEA*bI3CflO`-$uxX>f0vtMU>7vLY
zN-V*n2cJFy1}L+PkRd9ppvo$0tf9_28f-vOA!39kn`p6xHrwd1gD$)1u?HRQ(wXKi
Go%sWQ&aOuQ

delta 17
YcmX@a(#$x)ligB_jiW+9Y+{5l04gB_RsaA1


From f1800f68c545882717761ce65fca936419d1b84b Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Tue, 13 Dec 2022 09:16:46 +0800
Subject: [PATCH 2/3] audio: remove speaker-safe

Bug: 260062610
Test: manual test (b/260062610#comment11)

Change-Id: I0335f84d5164b9a7f80ba124ee0416575033cf0e
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/felix/config/audio_policy_configuration.xml            | 5 -----
 .../audio_policy_configuration_a2dp_offload_disabled.xml     | 5 -----
 .../audio_policy_configuration_bluetooth_legacy_hal.xml      | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/audio/felix/config/audio_policy_configuration.xml b/audio/felix/config/audio_policy_configuration.xml
index 046bc86..41b91bb 100644
--- a/audio/felix/config/audio_policy_configuration.xml
+++ b/audio/felix/config/audio_policy_configuration.xml
@@ -17,7 +17,6 @@
         <module name="primary" halVersion="2.0">
             <attachedDevices>
                 <item>Speaker</item>
-                <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
@@ -133,8 +132,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
                 </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -183,8 +180,6 @@
             <routes>
                 <route type="mix" sink="Speaker"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Earpiece"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT A2DP Out"
diff --git a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
index d48db0f..b4eaf0c 100644
--- a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -17,7 +17,6 @@
         <module name="primary" halVersion="2.0">
             <attachedDevices>
                 <item>Speaker</item>
-                <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
@@ -132,8 +131,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
                 </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -169,8 +166,6 @@
             <routes>
                 <route type="mix" sink="Speaker"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Earpiece"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="USB Device Out"
diff --git a/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index af503eb..7fd7f28 100644
--- a/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -17,7 +17,6 @@
         <module name="primary" halVersion="2.0">
             <attachedDevices>
                 <item>Speaker</item>
-                <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
@@ -128,8 +127,6 @@
                 </devicePort>
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
                 </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -165,8 +162,6 @@
             <routes>
                 <route type="mix" sink="Speaker"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Earpiece"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="USB Device Out"

From dffb53df97c4108bb34a618b1473428939e80ed3 Mon Sep 17 00:00:00 2001
From: JimiChen <jimichen@google.com>
Date: Thu, 15 Dec 2022 22:10:16 +0800
Subject: [PATCH 3/3] upadte felix_camera_front_inner_mipi_coex_table

Bug: 258743031
Test: scone_release.apk
Change-Id: I2c07f0f91f3638e35c16a3cb6f2e511c9393f5d5
---
 felix/radio/felix_camera_front_inner_mipi_coex_table.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/felix/radio/felix_camera_front_inner_mipi_coex_table.csv b/felix/radio/felix_camera_front_inner_mipi_coex_table.csv
index c4b6f8f..a3312b6 100644
--- a/felix/radio/felix_camera_front_inner_mipi_coex_table.csv
+++ b/felix/radio/felix_camera_front_inner_mipi_coex_table.csv
@@ -1,3 +1,3 @@
 706560,718850
 
-2417000,2452000,706560
+2427000,2442000,706560