Merge cherrypicks of ['googleplex-android-review.googlesource.com/21351238', 'googleplex-android-review.googlesource.com/21259403'] into tm-d4-release.
Change-Id: I02dcf172d16418c638a1ee1e73e2ea509ebf64c0
diff --git a/audio/lynx/tuning/fortemedia/BLUETOOTH.dat b/audio/lynx/tuning/fortemedia/BLUETOOTH.dat
index efa56d2..f781c7e 100644
--- a/audio/lynx/tuning/fortemedia/BLUETOOTH.dat
+++ b/audio/lynx/tuning/fortemedia/BLUETOOTH.dat
Binary files differ
diff --git a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
index 3cae375..dfc3656 100644
--- a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
+++ b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
@@ -1,7 +1,7 @@
#PLATFORM_NAME gChip
#EXPORT_FLAG BLUETOOTH
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2022-12-28 18:52:16
+#SAVE_TIME 2023-02-06 19:03:47
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
#PARAM_MODE FULL
@@ -236,8 +236,8 @@
225 0x1B58 //TX_RATIO_DT_L_TH_HIGH
226 0x4E20 //TX_RATIO_DT_H_TH_HIGH
227 0x0001 //TX_RATIO_DT_L0_TH
-228 0x7FF0 //TX_B_POST_FILT_ECHO_L
-229 0x2000 //TX_B_POST_FILT_ECHO_H
+228 0x1000 //TX_B_POST_FILT_ECHO_L
+229 0x1000 //TX_B_POST_FILT_ECHO_H
230 0x0200 //TX_MIN_G_CTRL_ECHO
231 0x1000 //TX_B_LESSCUT_RTO_ECHO
232 0x0000 //TX_EPD_OFFSET_00
diff --git a/audio/lynx/tuning/fortemedia/HANDSFREE.dat b/audio/lynx/tuning/fortemedia/HANDSFREE.dat
index 535d5b1..0c2aba7 100644
--- a/audio/lynx/tuning/fortemedia/HANDSFREE.dat
+++ b/audio/lynx/tuning/fortemedia/HANDSFREE.dat
Binary files differ
diff --git a/audio/lynx/tuning/fortemedia/HANDSFREE.mods b/audio/lynx/tuning/fortemedia/HANDSFREE.mods
index 11706f4..ae6122c 100644
--- a/audio/lynx/tuning/fortemedia/HANDSFREE.mods
+++ b/audio/lynx/tuning/fortemedia/HANDSFREE.mods
@@ -1,7 +1,7 @@
#PLATFORM_NAME gChip
#EXPORT_FLAG HANDSFREE
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2022-12-29 14:41:27
+#SAVE_TIME 2023-02-06 19:02:58
#CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
#PARAM_MODE FULL
@@ -236,8 +236,8 @@
225 0x1B58 //TX_RATIO_DT_L_TH_HIGH
226 0x4E20 //TX_RATIO_DT_H_TH_HIGH
227 0x0001 //TX_RATIO_DT_L0_TH
-228 0x7FF0 //TX_B_POST_FILT_ECHO_L
-229 0x2000 //TX_B_POST_FILT_ECHO_H
+228 0x1000 //TX_B_POST_FILT_ECHO_L
+229 0x1000 //TX_B_POST_FILT_ECHO_H
230 0x0200 //TX_MIN_G_CTRL_ECHO
231 0x1000 //TX_B_LESSCUT_RTO_ECHO
232 0x0000 //TX_EPD_OFFSET_00
diff --git a/audio/lynx/tuning/fortemedia/HEADSET.dat b/audio/lynx/tuning/fortemedia/HEADSET.dat
index 1654217..46ec9f3 100644
--- a/audio/lynx/tuning/fortemedia/HEADSET.dat
+++ b/audio/lynx/tuning/fortemedia/HEADSET.dat
Binary files differ
diff --git a/audio/lynx/tuning/fortemedia/HEADSET.mods b/audio/lynx/tuning/fortemedia/HEADSET.mods
index 60129aa..748d46f 100644
--- a/audio/lynx/tuning/fortemedia/HEADSET.mods
+++ b/audio/lynx/tuning/fortemedia/HEADSET.mods
@@ -1,7 +1,7 @@
#PLATFORM_NAME gChip
#EXPORT_FLAG HEADSET
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2022-12-29 14:20:45
+#SAVE_TIME 2023-02-06 19:03:20
#CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
#PARAM_MODE FULL
@@ -26936,8 +26936,8 @@
225 0x1B58 //TX_RATIO_DT_L_TH_HIGH
226 0x4E20 //TX_RATIO_DT_H_TH_HIGH
227 0x0001 //TX_RATIO_DT_L0_TH
-228 0x7FF0 //TX_B_POST_FILT_ECHO_L
-229 0x2000 //TX_B_POST_FILT_ECHO_H
+228 0x1000 //TX_B_POST_FILT_ECHO_L
+229 0x1000 //TX_B_POST_FILT_ECHO_H
230 0x0200 //TX_MIN_G_CTRL_ECHO
231 0x1000 //TX_B_LESSCUT_RTO_ECHO
232 0x0000 //TX_EPD_OFFSET_00
@@ -66986,8 +66986,8 @@
225 0x1B58 //TX_RATIO_DT_L_TH_HIGH
226 0x4E20 //TX_RATIO_DT_H_TH_HIGH
227 0x0001 //TX_RATIO_DT_L0_TH
-228 0x7FF0 //TX_B_POST_FILT_ECHO_L
-229 0x2000 //TX_B_POST_FILT_ECHO_H
+228 0x1000 //TX_B_POST_FILT_ECHO_L
+229 0x1000 //TX_B_POST_FILT_ECHO_H
230 0x0200 //TX_MIN_G_CTRL_ECHO
231 0x1000 //TX_B_LESSCUT_RTO_ECHO
232 0x0000 //TX_EPD_OFFSET_00
diff --git a/device-lynx.mk b/device-lynx.mk
index 42d8c3d..8047df6 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -269,4 +269,8 @@
# SKU specific RROs
PRODUCT_PACKAGES += \
- SettingsOverlayG82U8
+ SettingsOverlayG82U8 \
+ SettingsOverlayG0DZQ \
+ SettingsOverlayGHL1X \
+ SettingsOverlayGWKK3
+
diff --git a/lynx/overlay_packages/SettingsOverlayG0DZQ/Android.bp b/lynx/overlay_packages/SettingsOverlayG0DZQ/Android.bp
new file mode 100644
index 0000000..58e74b3
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayG0DZQ/Android.bp
@@ -0,0 +1,8 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "SettingsOverlayG0DZQ",
+ product_specific: true,
+}
diff --git a/lynx/overlay_packages/SettingsOverlayG0DZQ/AndroidManifest.xml b/lynx/overlay_packages/SettingsOverlayG0DZQ/AndroidManifest.xml
new file mode 100644
index 0000000..80eb718
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayG0DZQ/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settings.overlay.g0dzq">
+ <application android:hasCode="false" />
+ <overlay android:targetPackage="com.android.settings"
+ android:requiredSystemPropertyName="ro.boot.hardware.sku"
+ android:requiredSystemPropertyValue="G0DZQ"
+ android:isStatic="true" />
+</manifest>
diff --git a/lynx/overlay_packages/SettingsOverlayG0DZQ/res/drawable/regulatory_info.png b/lynx/overlay_packages/SettingsOverlayG0DZQ/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..3cbbbd6
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayG0DZQ/res/drawable/regulatory_info.png
Binary files differ
diff --git a/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png b/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png
index cb9d273..8ec2af0 100644
--- a/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png
+++ b/lynx/overlay_packages/SettingsOverlayG82U8/res/drawable/regulatory_info.png
Binary files differ
diff --git a/lynx/overlay_packages/SettingsOverlayGHL1X/Android.bp b/lynx/overlay_packages/SettingsOverlayGHL1X/Android.bp
new file mode 100644
index 0000000..9194826
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayGHL1X/Android.bp
@@ -0,0 +1,8 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "SettingsOverlayGHL1X",
+ product_specific: true,
+}
diff --git a/lynx/overlay_packages/SettingsOverlayGHL1X/AndroidManifest.xml b/lynx/overlay_packages/SettingsOverlayGHL1X/AndroidManifest.xml
new file mode 100644
index 0000000..e186a15
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayGHL1X/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settings.overlay.ghl1x">
+ <application android:hasCode="false" />
+ <overlay android:targetPackage="com.android.settings"
+ android:requiredSystemPropertyName="ro.boot.hardware.sku"
+ android:requiredSystemPropertyValue="GHL1X"
+ android:isStatic="true" />
+</manifest>
diff --git a/lynx/overlay_packages/SettingsOverlayGHL1X/res/drawable/regulatory_info.png b/lynx/overlay_packages/SettingsOverlayGHL1X/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..40434a6
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayGHL1X/res/drawable/regulatory_info.png
Binary files differ
diff --git a/lynx/overlay_packages/SettingsOverlayGWKK3/Android.bp b/lynx/overlay_packages/SettingsOverlayGWKK3/Android.bp
new file mode 100644
index 0000000..b0c5b79
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayGWKK3/Android.bp
@@ -0,0 +1,8 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "SettingsOverlayGWKK3",
+ product_specific: true,
+}
diff --git a/lynx/overlay_packages/SettingsOverlayGWKK3/AndroidManifest.xml b/lynx/overlay_packages/SettingsOverlayGWKK3/AndroidManifest.xml
new file mode 100644
index 0000000..5a475a5
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayGWKK3/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.settings.overlay.gwkk3">
+ <application android:hasCode="false" />
+ <overlay android:targetPackage="com.android.settings"
+ android:requiredSystemPropertyName="ro.boot.hardware.sku"
+ android:requiredSystemPropertyValue="GWKK3"
+ android:isStatic="true" />
+</manifest>
diff --git a/lynx/overlay_packages/SettingsOverlayGWKK3/res/drawable/regulatory_info.png b/lynx/overlay_packages/SettingsOverlayGWKK3/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..c7d16d6
--- /dev/null
+++ b/lynx/overlay_packages/SettingsOverlayGWKK3/res/drawable/regulatory_info.png
Binary files differ
