From 0a99fb90e9cf0ab498239f378f2754d452dfe459 Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Mon, 7 Aug 2023 21:00:07 +0000
Subject: [PATCH 1/2] Set PMU_POLL to 0 instead of setting SPC threshold to 100
 for CAMERA_ZOOMING_BOOST

Bug: 291979193
Test: Device boots okay with new powerhint file
Change-Id: I466873b118d12e1d72a237df72fa5d278ee2405d
---
 perf/powerhint-husky.json      | 19 ++-----------------
 perf/powerhint-ripcurrent.json | 19 ++-----------------
 perf/powerhint-shiba.json      | 19 ++-----------------
 3 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 86438df..265c778 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -654,7 +654,6 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "70",
         "42",
         "35",
@@ -686,7 +685,6 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "30",
         "20",
@@ -716,7 +714,6 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "22",
         "20"
@@ -1207,21 +1204,9 @@
     },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Node": "PMU_POLL",
       "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_MID_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_BIG_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
+      "Value": "0"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index f745ec0..4118b77 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -637,7 +637,6 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "70",
         "42",
         "35",
@@ -669,7 +668,6 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "30",
         "20",
@@ -699,7 +697,6 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "22",
         "20"
@@ -1144,21 +1141,9 @@
     },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Node": "PMU_POLL",
       "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_MID_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_BIG_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
+      "Value": "0"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 3d56d8b..4fb526c 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -654,7 +654,6 @@
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "70",
         "42",
         "35",
@@ -686,7 +685,6 @@
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "30",
         "20",
@@ -716,7 +714,6 @@
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
-        "100",
         "50",
         "22",
         "20"
@@ -1207,21 +1204,9 @@
     },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_LIT_SPC_THRESHOLD",
+      "Node": "PMU_POLL",
       "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_MID_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "CAMERA_ZOOMING_BOOST",
-      "Node": "PMU_BIG_SPC_THRESHOLD",
-      "Duration": 100,
-      "Value": "100"
+      "Value": "0"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",

From b8e712bd4cbf383b9cf5de11f762765aa1475fa2 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 2 Aug 2023 17:21:02 +0000
Subject: [PATCH 2/2] flag_stop_face_auth_on_display_off is true for this
 device

Test: manual
Bug: 290077758
Change-Id: I64508ab579319415d2c59629c68f8bc8f44afc40
---
 .../packages/SystemUI/res/values/flags.xml    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml

diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml
new file mode 100644
index 0000000..3d4a679
--- /dev/null
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2023, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+    <!-- Whether face auth will immediately stop when the display state is OFF -->
+    <bool name="flag_stop_face_auth_on_display_off">true</bool>
+</resources>
+