diff --git a/audio/caiman/aidl_config/audio_platform_configuration.xml b/audio/caiman/aidl_config/audio_platform_configuration.xml
index 758650fa..42f18c33 100644
--- a/audio/caiman/aidl_config/audio_platform_configuration.xml
+++ b/audio/caiman/aidl_config/audio_platform_configuration.xml
@@ -315,107 +315,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/komodo/aidl_config/audio_platform_configuration.xml b/audio/komodo/aidl_config/audio_platform_configuration.xml
index 758650fa..42f18c33 100644
--- a/audio/komodo/aidl_config/audio_platform_configuration.xml
+++ b/audio/komodo/aidl_config/audio_platform_configuration.xml
@@ -315,107 +315,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/audio/tokay/aidl_config/audio_platform_configuration.xml b/audio/tokay/aidl_config/audio_platform_configuration.xml
index 758650fa..42f18c33 100644
--- a/audio/tokay/aidl_config/audio_platform_configuration.xml
+++ b/audio/tokay/aidl_config/audio_platform_configuration.xml
@@ -315,107 +315,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/device-tokay.mk b/device-tokay.mk
index 3ca68980..9cd57503 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -45,7 +45,7 @@ $(call soong_config_set,google3a_config,target_device,tokay)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
# Init files
@@ -96,7 +96,8 @@ PRODUCT_PACKAGES += \
camera_front_mipi_coex_table \
camera_rear_main_mipi_coex_table \
camera_rear_wide_mipi_coex_table \
- display_primary_mipi_coex_table
+ display_primary_mipi_coex_table \
+ display_primary_ssc_coex_table
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
diff --git a/radio/caiman/coex/display_primary_mipi_coex_table.csv b/radio/caiman/coex/display_primary_mipi_coex_table.csv
index c8357d37..885a0440 100644
--- a/radio/caiman/coex/display_primary_mipi_coex_table.csv
+++ b/radio/caiman/coex/display_primary_mipi_coex_table.csv
@@ -1,19 +1,19 @@
-1368000,1288000
-SNH,1368000
-CHA,1368000
+684000,644000
+SNH,684000
+CHA,684000
-642000,646000,1368000
-805000,806000,1368000
-1930000,1933000,1368000
-2415000,2422000,1368000
-2576000,2578000,1368000
-3864000,3868000,1368000
-4546000,4548000,1368000
-5796000,5805000,1368000
-7075000,7084000,1368000
-1525000,1559000,1288000
-2172000,2174000,1288000
-2193000,2195000,1288000
-3415000,3425000,1288000
-4740000,4742000,1288000
-6155000,6156000,1288000
\ No newline at end of file
+642000,646000,684000
+805000,806000,684000
+1930000,1933000,684000
+2415000,2422000,684000
+2576000,2578000,684000
+3864000,3868000,684000
+4546000,4548000,684000
+5796000,5805000,684000
+7075000,7084000,684000
+1525000,1559000,644000
+2172000,2174000,644000
+2193000,2195000,644000
+3415000,3425000,644000
+4740000,4742000,644000
+6155000,6156000,644000
\ No newline at end of file
diff --git a/radio/komodo/coex/display_primary_mipi_coex_table.csv b/radio/komodo/coex/display_primary_mipi_coex_table.csv
index c8357d37..f383da0e 100644
--- a/radio/komodo/coex/display_primary_mipi_coex_table.csv
+++ b/radio/komodo/coex/display_primary_mipi_coex_table.csv
@@ -1,19 +1,19 @@
-1368000,1288000
-SNH,1368000
-CHA,1368000
+684000,6440000
+SNH,684000
+CHA,684000
-642000,646000,1368000
-805000,806000,1368000
-1930000,1933000,1368000
-2415000,2422000,1368000
-2576000,2578000,1368000
-3864000,3868000,1368000
-4546000,4548000,1368000
-5796000,5805000,1368000
-7075000,7084000,1368000
-1525000,1559000,1288000
-2172000,2174000,1288000
-2193000,2195000,1288000
-3415000,3425000,1288000
-4740000,4742000,1288000
-6155000,6156000,1288000
\ No newline at end of file
+642000,646000,684000
+805000,806000,684000
+1930000,1933000,684000
+2415000,2422000,684000
+2576000,2578000,684000
+3864000,3868000,684000
+4546000,4548000,684000
+5796000,5805000,684000
+7075000,7084000,684000
+1525000,1559000,6440000
+2172000,2174000,6440000
+2193000,2195000,6440000
+3415000,3425000,6440000
+4740000,4742000,6440000
+6155000,6156000,6440000
\ No newline at end of file
diff --git a/radio/tokay/coex/Android.bp b/radio/tokay/coex/Android.bp
index 1366f017..e2819986 100644
--- a/radio/tokay/coex/Android.bp
+++ b/radio/tokay/coex/Android.bp
@@ -59,3 +59,11 @@ prebuilt_etc {
src: "display_primary_mipi_coex_table.csv",
relative_install_path: "modem",
}
+
+prebuilt_etc {
+ name: "display_primary_ssc_coex_table",
+ filename: "display_primary_ssc_coex_table.csv",
+ vendor: true,
+ src: "display_primary_ssc_coex_table.csv",
+ relative_install_path: "modem",
+}
diff --git a/radio/tokay/coex/display_primary_mipi_coex_table.csv b/radio/tokay/coex/display_primary_mipi_coex_table.csv
index 78b425e5..7768ce6d 100644
--- a/radio/tokay/coex/display_primary_mipi_coex_table.csv
+++ b/radio/tokay/coex/display_primary_mipi_coex_table.csv
@@ -1,18 +1,18 @@
-756000,776000
-SNH,756000
-CHA,756000
+378000,388000
+SNH,378000
+CHA,378000
-772000,781000,756000
-1547000,1557000,756000
-1935000,1945000,756000
-3487000,3497000,756000
-5815000,5825000,756000
-751000,761000,776000
-940000,950000,776000
-1531000,1533000,776000
-1890000,1900000,776000
-2641000,2651000,776000
-3397000,3407000,776000
-4153000,4163000,776000
-4931000,4941000,776000
-4645000,4655000,776000
\ No newline at end of file
+772000,781000,378000
+1547000,1557000,378000
+1935000,1945000,378000
+3487000,3497000,378000
+5815000,5825000,378000
+751000,761000,388000
+940000,950000,388000
+1531000,1533000,388000
+1890000,1900000,388000
+2641000,2651000,388000
+3397000,3407000,388000
+4153000,4163000,388000
+4931000,4941000,388000
+4645000,4655000,388000
\ No newline at end of file
diff --git a/radio/tokay/coex/display_primary_ssc_coex_table.csv b/radio/tokay/coex/display_primary_ssc_coex_table.csv
new file mode 100644
index 00000000..2f2d32fa
--- /dev/null
+++ b/radio/tokay/coex/display_primary_ssc_coex_table.csv
@@ -0,0 +1,6 @@
+1,0
+SNH,0
+CHA,0
+
+636000,644000,1
+764000,768000,1
\ No newline at end of file