From 26fefc16908989eecbae769a3f8d82be04541570 Mon Sep 17 00:00:00 2001
From: Sungcheol Ahn <donaldahn@google.com>
Date: Tue, 10 Sep 2024 08:17:55 +0000
Subject: [PATCH 1/2] Force EST loopback for hidden menu testing

Test: manual
Bug: b/365556180
Flag: EXEMPT test only

Change-Id: I581257736e12ec1ebd533f9494855f8132a6c5fe
---
 overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index cb3e540..6a884c6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -522,6 +522,9 @@
     <!-- The package name of the app to handle oem-enabled satellite SOS messaging. -->
     <string name="config_oem_enabled_satellite_sos_handover_app">com.google.android.apps.stargate;com.google.android.apps.stargate.questionnaire.QuestionnaireHomeActivity</string>
 
+    <!-- The intent action to handle esp loopback eSOS messaging. -->
+    <string name="config_satellite_test_with_esp_replies_intent_action">com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE_TEST_WITH_ESP_REPLIES</string>
+
     <!-- The intent action to handle oem-enabled satellite SOS messaging. -->
     <string name="config_satellite_emergency_handover_intent_action">com.google.android.apps.stargate.ACTION_ESOS_QUESTIONNAIRE</string>
 

From dcaeaf64cf1b7778621ea1e35b4ee96ab291ba2d Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Mon, 23 Sep 2024 12:42:32 +0000
Subject: [PATCH 2/2] Change permission of fg_wi file nodes

Bug: 200769420
Test: build pass
Flag: NONE vendor init file does not support flag
Change-Id: I5830f0faa2230aa8bf66d13f64c3156aab0d8379
---
 conf/init.zumapro.board.rc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index 14a6282..92b21e3 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -32,6 +32,7 @@ on init
     chown system system /proc/vendor_sched/groups/dex2oat/set_task_group
     chown system system /proc/vendor_sched/groups/cam_power/set_task_group
     chown system system /proc/vendor_sched/groups/ota/set_task_group
+    chown system system /proc/vendor_sched/groups/fg_wi/set_task_group
     chown system system /proc/vendor_sched/groups/bg/set_proc_group
     chown system system /proc/vendor_sched/groups/cam/set_proc_group
     chown system system /proc/vendor_sched/groups/fg/set_proc_group
@@ -44,6 +45,7 @@ on init
     chown system system /proc/vendor_sched/groups/dex2oat/set_proc_group
     chown system system /proc/vendor_sched/groups/cam_power/set_proc_group
     chown system system /proc/vendor_sched/groups/ota/set_proc_group
+    chown system system /proc/vendor_sched/groups/fg_wi/set_proc_group
     chown system system /proc/vendor_sched/prefer_idle_set
     chown system system /proc/vendor_sched/prefer_idle_clear
     chown system system /proc/vendor_sched/pmu_poll_enable
@@ -63,6 +65,7 @@ on init
     chmod 0220 /proc/vendor_sched/groups/dex2oat/set_task_group
     chmod 0220 /proc/vendor_sched/groups/cam_power/set_task_group
     chmod 0220 /proc/vendor_sched/groups/ota/set_task_group
+    chmod 0220 /proc/vendor_sched/groups/fg_wi/set_task_group
     chmod 0220 /proc/vendor_sched/groups/bg/set_proc_group
     chmod 0220 /proc/vendor_sched/groups/cam/set_proc_group
     chmod 0220 /proc/vendor_sched/groups/fg/set_proc_group
@@ -75,6 +78,7 @@ on init
     chmod 0220 /proc/vendor_sched/groups/dex2oat/set_proc_group
     chmod 0220 /proc/vendor_sched/groups/cam_power/set_proc_group
     chmod 0220 /proc/vendor_sched/groups/ota/set_proc_group
+    chmod 0220 /proc/vendor_sched/groups/fg_wi/set_proc_group
     chmod 0220 /proc/vendor_sched/prefer_idle_set
     chmod 0220 /proc/vendor_sched/prefer_idle_clear
     chmod 0660 /proc/vendor_sched/pmu_poll_enable