From e471d7385713c6582a5c05b649b71a6ddf900273 Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:15:00 +0800 Subject: [PATCH 1/9] Relocate modem_svc_sit to proper places Flag: EXEMPT refactor Bug: 358485346 Test: m modem_svc_sit Change-Id: I526fa249612a18324bbdd9d4105d53519c23e075 --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index fc4f739d..6e738193 100644 --- a/device.mk +++ b/device.mk @@ -960,9 +960,6 @@ PRODUCT_COPY_FILES += \ device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit - # modem logging binary/configs PRODUCT_PACKAGES += modem_logging_control From 7ed8a55835c0166275180f53cb10261a1d522692 Mon Sep 17 00:00:00 2001 From: Kuen-Han Tsai Date: Wed, 9 Oct 2024 14:48:22 +0800 Subject: [PATCH 2/9] 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: Id6886283d6f2f9179b3a9c5d535646874e9f277b Signed-off-by: Kuen-Han Tsai --- 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 0736f4c4..ab7932ba 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -943,17 +943,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 60ef8d69497427eaf71da7534b2361470b552217 Mon Sep 17 00:00:00 2001 From: Robin Hsu Date: Mon, 14 Oct 2024 02:50:00 +0000 Subject: [PATCH 3/9] gs101: Disable kmem cgroup accounting Disable cgroup kernel memory accounting to avoid unnecessary overhead similar change ag/22891292 but now back-port to gs101 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: I4ab5d20a2d74c023c6fca26b32c8acc67fcd2582 Signed-off-by: Robin Hsu --- BoardConfig-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 22a3c979..9483afff 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -44,6 +44,7 @@ BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 an BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy BOARD_KERNEL_CMDLINE += swiotlb=noforce +BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs TARGET_NO_BOOTLOADER := true From b2af325920e88b4d1c500dff2cfa7deddb7068cf Mon Sep 17 00:00:00 2001 From: Robert Luo Date: Fri, 11 Oct 2024 12:49:49 +0800 Subject: [PATCH 4/9] [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: I5804b3d3289519f19ca9acb232ecc0a715ad00a5 --- default-permissions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default-permissions.xml b/default-permissions.xml index 4a3e1c60..61770526 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -173,7 +173,7 @@ - + From 838d1086c9b2f4594561de8ce9040cc7de229051 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Tue, 22 Oct 2024 08:09:39 +0000 Subject: [PATCH 5/9] gs101: MCP: Set the vendor customized max cached processes to 1024. Bug: 374891496 Test: adb shell dumpsys activity | grep CUR_MAX_CACHED_PROCESSES Flag: EXEMPT config XML change Change-Id: I072c8de8bc78ac6888cb6bbf0344678ac03de3a9 --- 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 964ebf6f..6d4d0231 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -272,6 +272,9 @@ true + + 1024 +