From 5cbf843d946c92e8fde64e3c550a3a78a67bfa2a Mon Sep 17 00:00:00 2001
From: Greg Piecyk <gpiecyk@google.com>
Date: Mon, 24 Jun 2024 21:55:25 +0000
Subject: [PATCH 1/2] [TK4] Add config.xml to OMA-DM package with DevInfo Model
 name.

Set DevInfo Model name to G2YBB for Tokay (TK4).

Bug: 347343298
Change-Id: I95e51fcdf53b3e137565bc2e47ca67755904f369
Test: b/347343298
---
 .../packages/apps/OMA-DM/DMService/res/values/config.xml  | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 tokay/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml

diff --git a/tokay/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/tokay/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 00000000..06ef1888
--- /dev/null
+++ b/tokay/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">G2YBB</string>
+</resources>

From 58a1edecf201140817d4ffad21f007dbae94ab7c Mon Sep 17 00:00:00 2001
From: Chris Lu <luchris@google.com>
Date: Fri, 14 Jun 2024 13:03:56 +0000
Subject: [PATCH 2/2] Display: allow BTS follow operation rate

Set the OP HZ Config to allow BTS follow operation rate. This will
not trigger NS mode switch.

Bug: 340999835
Test: Smooth display on/off
Change-Id: I992914b7e0c0911d44a9d263dbb4839814f15b12
---
 device-caiman.mk | 5 +++++
 device-komodo.mk | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/device-caiman.mk b/device-caiman.mk
index b2b2aa2d..698eef55 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -328,6 +328,11 @@ ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
     PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
 endif
 
+# Display OP HZ Config
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.primarydisplay.op.hs_hz=120 \
+    vendor.primarydisplay.op.ns_hz=120
+
 # Display fixed TE2
 PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120
 
diff --git a/device-komodo.mk b/device-komodo.mk
index 619e79ca..31cf4a47 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -90,6 +90,11 @@ endif
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
 
+# Display OP HZ Config
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.primarydisplay.op.hs_hz=120 \
+    vendor.primarydisplay.op.ns_hz=120
+
 # Display fixed TE2
 PRODUCT_VENDOR_PROPERTIES += vendor.primarydisplay.fixed_te2.default_rate_hz=120