From 1ff12806bb21e933555d585560339d6fc0abe26f Mon Sep 17 00:00:00 2001
From: Mao Lee <chengmaolee@google.com>
Date: Mon, 8 May 2023 03:28:11 +0000
Subject: [PATCH 1/3] Camera: Add the property and create the power hint to
 adjust backend min clock for 1080p30fps video stream for front cameras

Bug: 279141417
Test: adb logcat, GCA, CTS
Change-Id: I0f2a11980d0db5893e5f235271d569184b11dd43
---
 device-felix.mk |  1 +
 powerhint.json  | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/device-felix.mk b/device-felix.mk
index a815da2..ea0a937 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -300,6 +300,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Camera
 PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.camera.adjust_backend_min_freq_for_1p_front_video_1080p_30fps=1 \
     persist.vendor.camera.extended_launch_boost=1 \
     persist.vendor.camera.optimized_tnr_freq=1 \
     persist.vendor.camera.raise_buf_allocation_priority=1 \
diff --git a/powerhint.json b/powerhint.json
index 29446c7..9301b23 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -345,6 +345,7 @@
       "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
       "Values": [
         "664000",
+        "233000",
         "67000"
       ],
       "ResetOnInit": true
@@ -364,6 +365,7 @@
       "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq",
       "Values": [
         "664000",
+        "233000",
         "67000"
       ],
       "ResetOnInit": true
@@ -1361,6 +1363,18 @@
       "Duration": 0,
       "Value": "302000"
     },
+    {
+      "PowerHint": "CAMERA_ADJUST_BACKEND_MIN_FREQ",
+      "Node": "INTCAMFreq",
+      "Duration": 0,
+      "Value": "233000"
+    },
+    {
+      "PowerHint": "CAMERA_ADJUST_BACKEND_MIN_FREQ",
+      "Node": "TNRFreq",
+      "Duration": 0,
+      "Value": "233000"
+    },
     {
       "PowerHint": "CAMERA_TNR_LOW",
       "Node": "TNRMaxFreq",

From 10c8e193c5237ace8e99f03b43b7cf5793c4af24 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Mon, 8 May 2023 14:54:57 +0800
Subject: [PATCH 2/3] Update Felix SVN to 6

Bug: 278035362
Change-Id: I724ce2c7605594e1416fdaec12421f62bd613f7e
---
 device-felix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-felix.mk b/device-felix.mk
index 9042235..361fca2 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -197,7 +197,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=5
+    ro.vendor.build.svn=6
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\

From e47c1d77454604edcea5473e7e77708b7040c478 Mon Sep 17 00:00:00 2001
From: eddielan <eddielan@google.com>
Date: Tue, 9 May 2023 13:40:18 +0800
Subject: [PATCH 3/3] fingerprint: Update power-key event

Bug: 281193407
Test: Build pass
Change-Id: Ic176afdcec4b3acc4dbbbe1db4550b351c43fb54
---
 fingerprint_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fingerprint_config.mk b/fingerprint_config.mk
index 2255f3b..2e96488 100644
--- a/fingerprint_config.mk
+++ b/fingerprint_config.mk
@@ -4,7 +4,7 @@ GOOGLE_CONFIG_FP_STATUS=1
 FPC_CONFIG_TRUSTY_CLEAN_TA=1
 else
 # Non factory build, use fingerprint AIDL version
-GOOGLE_CONFIG_POWER_NODE=/dev/input/event1
+GOOGLE_CONFIG_POWER_NODE=/dev/input/event2
 GOOGLE_CONFIG_DP_COUNT=2
 GOOGLE_CONFIG_FP_STATUS=1
 endif