From 617251a80a389acd7cc84ca6b106d3684e15c0cf Mon Sep 17 00:00:00 2001
From: Jim Tang <jimtang@google.com>
Date: Fri, 4 Oct 2024 15:48:16 +0800
Subject: [PATCH 01/10] Relocate modem_svc_sit to proper places

Flag: EXEMPT refactor
Bug: 358485346
Test: m modem_svc_sit
Change-Id: Ib47ac55c504eafd32340e66a7286be48f2ea7b48
---
 device.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/device.mk b/device.mk
index d20b5520..fd0eccfb 100644
--- a/device.mk
+++ b/device.mk
@@ -959,9 +959,6 @@ USE_EARLY_SEND_DEVICE_INFO := true
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 
-# modem_svc_sit daemon
-PRODUCT_PACKAGES += modem_svc_sit
-
 # modem logging binary/configs
 PRODUCT_PACKAGES += modem_logging_control
 

From f22f21191bc9b9c6fe6e9e0e99b91b43d20c6010 Mon Sep 17 00:00:00 2001
From: Kuen-Han Tsai <khtsai@google.com>
Date: Wed, 9 Oct 2024 15:15:56 +0800
Subject: [PATCH 02/10] Usb: Add status check to prevent NPE

This patch prevents a Null Pointer Exception in
queryMoistureDetectionStatus() when getPortStatusHelper() fails to open
the /sys/class/typec file. The failure results in an empty
currentPortStatus vector, causing the NPE when accessing its first
element.

Bug: 361097811
Flag: EXEMPT bugfix
Test: NPE does not occur when getPortStatusHelper() fails
Change-Id: I61c9f7647aafca28b777e53f170764ddd02c060f
Signed-off-by: Kuen-Han Tsai <khtsai@google.com>
---
 usb/usb/Usb.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 5b38729b..530abb8c 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -990,17 +990,21 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
     Status status;
     pthread_mutex_lock(&usb->mLock);
     status = getPortStatusHelper(usb, currentPortStatus);
-    queryMoistureDetectionStatus(usb, currentPortStatus);
-    queryPowerTransferStatus(usb, currentPortStatus);
-    queryNonCompliantChargerStatus(currentPortStatus);
-    queryUsbDataSession(usb, currentPortStatus);
-    if (usb->mCallback != NULL) {
-        ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
-            status);
-        if (!ret.isOk())
-            ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
+    if (status == Status::SUCCESS && currentPortStatus->size() > 0) {
+        queryMoistureDetectionStatus(usb, currentPortStatus);
+        queryPowerTransferStatus(usb, currentPortStatus);
+        queryNonCompliantChargerStatus(currentPortStatus);
+        queryUsbDataSession(usb, currentPortStatus);
+        if (usb->mCallback != NULL) {
+            ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
+                status);
+            if (!ret.isOk())
+                ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
+        } else {
+            ALOGI("Notifying userspace skipped. Callback is NULL");
+        }
     } else {
-        ALOGI("Notifying userspace skipped. Callback is NULL");
+        ALOGI("%s skipped. currentPortStatus is empty", __func__);
     }
     pthread_mutex_unlock(&usb->mLock);
 }

From 0bfc85475d5c16b7a1aa16a5ebc1cca7d68d060e Mon Sep 17 00:00:00 2001
From: Robin Hsu <robinhsu@google.com>
Date: Wed, 2 Oct 2024 07:40:17 +0000
Subject: [PATCH 03/10] gs201: Disable kmem cgroup accounting

Disable cgroup kernel memory accounting to avoid unnecessary overhead

similar change ag/22891292 but now back-port to gs201

Flag: NONE kernel config
Bug: 373232814
Test: pts-tradefed run commandAndExit pts -m PtsPerfWbsTestCases
          -t com.google.android.perfwbs.pts.KernelModuleTest
          and alternative tests on forrest.

Change-Id: I306b3e608655dc9e5f868a1f1a79e60e5b9b40fd
---
 BoardConfig-common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 681bb146..3783e9f6 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -49,6 +49,7 @@ BOARD_KERNEL_CMDLINE += cgroup_disable=memory
 BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy
 BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
 BOARD_KERNEL_CMDLINE += swiotlb=1024
+BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem
 BOARD_KERNEL_CMDLINE += disable_dma32=on
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 

From c40d53b69bd9968585d1cce0a16c202798281f3c Mon Sep 17 00:00:00 2001
From: Robert Luo <robertluo@google.com>
Date: Fri, 11 Oct 2024 12:51:54 +0800
Subject: [PATCH 04/10] [Pixel RR] Apply reviewed default permissions

Pregrantting below permission(s):
CALL_PHONE

Flag: EXEMPT add pregranted permission in b/371912006
Bug: 336203918
Test: presubmit
Change-Id: I6ef16e5571706cd865d9083ebc363a181473eea9
---
 default-permissions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-permissions.xml b/default-permissions.xml
index afe5bc4d..45a2d303 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -180,7 +180,7 @@
     </exception>
 
     <exception package="com.google.android.apps.pixel.relationships">
-        <!-- Contacts -->
+        <permission name="android.permission.CALL_PHONE" fixed="false"/>
         <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
         <permission name="android.permission.READ_CONTACTS" fixed="false"/>
         <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>

From 08cc782e85fc9c4bea5c3e27a43252a60568997b Mon Sep 17 00:00:00 2001
From: Richard Chang <richardycc@google.com>
Date: Wed, 23 Oct 2024 04:10:13 +0000
Subject: [PATCH 05/10] gs201: MCP: Set the vendor customized max cached
 processes to 1024.

Bug: 374891496
Change-Id: I657ea431a33003b0cc3310589e9b8fa359a66fae
Test: adb shell dumpsys activity | grep CUR_MAX_CACHED_PROCESSES
Flag: EXEMPT config XML change
---
 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 d266ccd3..21bc5321 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -284,6 +284,9 @@
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
 
+    <!-- the number of the max cached processes in the system. -->
+    <integer name="config_customizedMaxCachedProcesses">1024</integer>
+
     <!-- List of system components which are allowed to receive ServiceState entries in an
      un-sanitized form, even if the location toggle is off. This is intended ONLY for system
      components, such as the telephony stack, which require access to the full ServiceState for

From 9826c8d0927ece37d02e89bdb7bb90df6123e720 Mon Sep 17 00:00:00 2001
From: Kostya Yarmash <kyarmash@google.com>
Date: Wed, 23 Oct 2024 12:04:12 +0000
Subject: [PATCH 06/10] init.gs201.rc: change permission of SJTAG writable
 files

On userdebug & eng builds, change permission of SJTAG writable sysfs files that need to be written to 'system'. This became necessary after HSUM separated main user from the SYSTEM user

Bug: 374645181
Flag: EXEMPT bugfix
Test: Ensure that there is "Privileged Debugging" item in BetterBug settings.

Signed-off-by: Kostya Yarmash <kyarmash@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cfde8e50cc66c22ca44da58f4a35c0b3e055646f)
Change-Id: I12857abcb94b4a7e6a068ea712c7f21c3de205ff
---
 conf/init.debug.rc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/init.debug.rc b/conf/init.debug.rc
index 3f8be42f..eb970541 100644
--- a/conf/init.debug.rc
+++ b/conf/init.debug.rc
@@ -15,6 +15,15 @@ on init
     chown system system /sys/devices/platform/sjtag_gsa/interface/end
     chown system system /sys/devices/platform/sjtag_gsa/interface/pubkey
 
+# HSUM separated main user from the SYSTEM user, granting write permissions
+# for write only SJTAG sysfs files
+    chmod 220 /sys/devices/platform/sjtag_ap/interface/auth
+    chmod 220 /sys/devices/platform/sjtag_ap/interface/begin
+    chmod 220 /sys/devices/platform/sjtag_ap/interface/end
+    chmod 220 /sys/devices/platform/sjtag_gsa/interface/auth
+    chmod 220 /sys/devices/platform/sjtag_gsa/interface/begin
+    chmod 220 /sys/devices/platform/sjtag_gsa/interface/end
+
 on property:vendor.debug.ramdump.force_crash=true
     write /sys/kernel/pixel_debug/trigger "null"
 

From 33f3bf6e45b2a0898ce89ffb5f3f2a5352e5ff92 Mon Sep 17 00:00:00 2001
From: kellyhung <kellyhung@google.com>
Date: Tue, 22 Oct 2024 10:17:26 +0000
Subject: [PATCH 07/10] Add a soong config variable for CitadelProvision

Bug: 373235487
Test: Presubmits
Flag: EXEMPT bugfix

Change-Id: Ia7ba2ccd292c536379120e57ed27f76f03fa2798
---
 BoardConfig-common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 3783e9f6..9da7e97c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -22,6 +22,7 @@ TARGET_SOC := gs201
 TARGET_SOC_NAME := google
 
 USES_DEVICE_GOOGLE_GS201 := true
+$(call soong_config_set,CitadelProvision,target_soc,gs201)
 
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-2a

From d764715871a727218f0361dd75458302af3ae49b Mon Sep 17 00:00:00 2001
From: Bill Yang <yangbill@google.com>
Date: Tue, 22 Oct 2024 10:48:40 +0000
Subject: [PATCH 08/10] Set BOARD_LIBACRYL_G2D_HDR_PLUGIN for soong

Set the full module path of libacryl_hdr_plugin and the include dir for
lobacryl conversion to soong. It will take effect after aosp/3286932 and
aosp/3287183 merged.

Bug: 370414334
Test: lunch aosp_panther-trunk_staging-userdebug ; m libacryl_hdr_plugin libacryl
Change-Id: I77d3e23d2c8fd956d7207e2aa486577646a18763
---
 BoardConfig-common.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 755f9668..46967791 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -267,6 +267,8 @@ BOARD_USES_EXYNOS_AFBC_FEATURE := true
 
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs201
 BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
+$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/gs201/libacryl_plugins:libacryl_hdr_plugin)
+$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap)
 
 # HWCServices
 BOARD_USES_HWC_SERVICES := true

From aed4820ab223f081c6cb3a99bfb5f0582a9c9ddb Mon Sep 17 00:00:00 2001
From: chenkris <chenkris@google.com>
Date: Fri, 25 Oct 2024 05:16:50 +0000
Subject: [PATCH 09/10] Add IGoodixFingerprintDaemon aidl interface

Flag: EXEMPT NDK
Bug: 370671685
Test: authenticate fingerprint.
Change-Id: Ib8871f722d2afca769494c047d098629e53ff2aa
---
 device_framework_matrix_product.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index c0b4deb2..abd23b24 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -100,6 +100,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
+        <version>1</version>
+        <interface>
+            <name>IGoodixFingerprintDaemon</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>2-3</version>

From e4f334feced29f46ea5c00395705c9e7a218b5a8 Mon Sep 17 00:00:00 2001
From: "Priyanka Advani (xWF)" <padvani@google.com>
Date: Wed, 30 Oct 2024 16:32:55 +0000
Subject: [PATCH 10/10] Revert "Add IGoodixFingerprintDaemon aidl interface"

Revert submission 30066446-goodix-ext-service-aidl

Reason for revert: Droidmonitor created revert due to b/376465180. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:30066446-goodix-ext-service-aidl

Change-Id: If0f21a8cfe11d9caad55defb963c961b7c16d284
---
 device_framework_matrix_product.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index abd23b24..c0b4deb2 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -100,14 +100,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
-        <version>1</version>
-        <interface>
-            <name>IGoodixFingerprintDaemon</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>2-3</version>