From 1c87048fd04f11c30f56048d8fcbc8878a35cf6e Mon Sep 17 00:00:00 2001
From: John Chang <cweichun@google.com>
Date: Sun, 31 Mar 2024 16:48:44 +0000
Subject: [PATCH 1/2] display: low-light blocking zone support

Bug: 315876417
Test: verify the functionality works
Change-Id: Id204511dbeb106f527e16279b4c20c990873fd58
---
 device-husky.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index 49a289c..8f5e683 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -367,9 +367,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 
 # blocking zone for min idle refresh rate
 PRODUCT_VENDOR_PROPERTIES += \
-    vendor.primarydisplay.min_idle_refresh_rate.default=1 \
-    vendor.primarydisplay.min_idle_refresh_rate.blocking_zone=10 \
-    vendor.primarydisplay.min_idle_refresh_rate.blocking_zone_dbv=492
+    ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=15:10,:1
 
 # Display ACL
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.acl.default=0

From 9e20df344309c34d0d098e884e134c06a467a6cb Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Wed, 3 Apr 2024 11:47:24 -0700
Subject: [PATCH 2/2] shiba/husky: add etm modules in userdebug/eng builds

Bug: 321061072
Test: build and run shiba/husky
Change-Id: Id440eac68093231ea65a777caa64fc48befb9729
---
 device-husky.mk      | 4 ++++
 device-shiba.mk      | 4 ++++
 husky/BoardConfig.mk | 3 +++
 shiba/BoardConfig.mk | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/device-husky.mk b/device-husky.mk
index 594dcae..b59538e 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -477,3 +477,7 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
+# ETM
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
diff --git a/device-shiba.mk b/device-shiba.mk
index 55f2d6b..ba6b5bd 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -445,3 +445,7 @@ PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
 
+# ETM
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index e77c4ff..0b0d56a 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -61,3 +61,6 @@ include device/google/zuma/BoardConfig-common.mk
 include device/google/shusky-sepolicy/husky-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
 
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/5_15/BoardUserdebugModules.mk
+endif
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 940e42b..f28c1df 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -55,3 +55,7 @@ include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/shiba-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
+
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/5_15/BoardUserdebugModules.mk
+endif