From b0cf5c0b084ff1c793ab987c29cb8189e0743b26 Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Wed, 4 Jan 2023 19:52:12 +0000
Subject: [PATCH 1/3] Enable GPS/Wifi coex for L10

Enable GPS/Wifi coex for L10 using the default values from P10

Bug: 263211979
Test: none
Change-Id: I6604b1ca36029b1a76222e11ef9adec06cecbb33
---
 rro_overlays/WifiOverlay/res/values/config.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 36b5076..1019ddb 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -126,6 +126,11 @@
     <!-- Enable the default coex channel avoidance algorithm and disable the functionality of
          WifiManager#setCoexUnsafeChannels. -->
     <bool translatable="false" name="config_wifiDefaultCoexAlgorithmEnabled">true</bool>
+    <!-- If the default coex channel avoidance algorithm is enabled, then avoid channels that
+         conflict with GPS L1. -->
+    <bool translatable="false" name="config_wifiCoexForGpsL1">true</bool>
+    <!-- The distance in KHz between Wi-Fi-based interference and GPS L1 that is considered unsafe. -->
+    <integer translatable="false" name="config_wifiCoexGpsL1ThresholdKhz">10000</integer>
 
     <!-- Whether to use the explicit vendor HAL API: IWifiStaIface.setRoamingState for disabling fw roaming. -->
     <bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool>

From 8e2785d7083f575c11c63c99e7e7bbb15684bd20 Mon Sep 17 00:00:00 2001
From: MingChe Chiang <blossomchiang@google.com>
Date: Sat, 7 Jan 2023 08:48:25 +0000
Subject: [PATCH 2/3] Reveal model/make name in camera EXIF

Bug: 241611453
Test: Check EXIF data from JPEG image, CTS
Change-Id: Id243ead3500b9ccd63a451dc019728a8982a5e48
Merged-In: I5e0116e7b7457c0fd9d2e9cbd0b2104b80fbbf76
---
 device-lynx.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index 5cededf..42d8c3d 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -237,6 +237,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.ois_with_system_imu=true
 
+# Enable camera exif model/make reporting
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.exif_reveal_make_model=true
+
 # Use GmsCorePrebuilt y2022w28
 USE_GMSCORE_PREBUILT_Y2022W28 := true
 

From c7536571d020b732673f2c2c5de48846b1b9ef7f Mon Sep 17 00:00:00 2001
From: Ken Yang <yangken@google.com>
Date: Fri, 6 Jan 2023 19:27:55 +0000
Subject: [PATCH 3/3] WLC: Remove wireless_charger service

Bug: 264624634
Bug: 263830018
Change-Id: Ifafd0359c41a70b2ceb2aa3857112fb6f62d5a2f
Signed-off-by: Ken Yang <yangken@google.com>
---
 device-lynx.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/device-lynx.mk b/device-lynx.mk
index 86f6167..4434c83 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -30,7 +30,6 @@ include device/google/lynx/audio/lynx/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 include device/google/lynx/vibrator/cs40l26/device.mk
 include device/google/gs-common/touch/gti/gti.mk
-include device/google/gs-common/wireless_charger/wireless_charger.mk
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,lynx)