From 3ce6a5fe2e962c1e4dd286f6f9dfa3957515499b Mon Sep 17 00:00:00 2001 From: Kuen-Han Tsai Date: Tue, 19 Sep 2023 16:37:20 +0800 Subject: [PATCH 1/3] Usb.cpp: Fix typos when unable to disable USB data If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display the message of "Not able to turn off usb connection notification". Test: refactoring CL. Existing tests still pass. Bug: 301016122 Change-Id: I5d2c24154bd1d2c20810bcb4db0a3b2cc575fcfe --- usb/usb/Usb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 5594bfff..858a7acd 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -128,7 +128,7 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable, } if (!WriteStringToFile("0", USB_DATA_PATH)) { - ALOGE("Not able to turn on usb connection notification"); + ALOGE("Not able to turn off usb connection notification"); result = false; } From daa06b517ed997994abc62474e34cbb1628be2fc Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Wed, 20 Sep 2023 13:25:57 -0400 Subject: [PATCH 2/3] Fix a crash trying to boot the device in a pseudolocale. Bug: 280361527 Test: Boot in XA Change-Id: Ief6a17da63ebe8ede682cb7fc537af77d02fc183 --- overlay/frameworks/base/packages/SystemUI/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 67dcdc54..269450ee 100644 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -26,5 +26,5 @@ false - M21,0C19.94,0.01 18.83,0.04 17.73,0.11C16.91,0.17 16.09,0.25 15.3,0.36C14.5,0.48 13.72,0.62 12.95,0.81C11.42,1.19 9.97,1.72 8.65,2.43C7.32,3.14 6.12,4.02 5.08,5.07C4.04,6.11 3.15,7.31 2.44,8.64C1.73,9.97 1.19,11.42 0.82,12.94C0.63,13.7 0.48,14.49 0.37,15.29C0.25,16.09 0.17,16.9 0.12,17.72C0.05,18.82 0.02,19.93 0.01,21.55 + M21,0C19.94,0.01 18.83,0.04 17.73,0.11C16.91,0.17 16.09,0.25 15.3,0.36C14.5,0.48 13.72,0.62 12.95,0.81C11.42,1.19 9.97,1.72 8.65,2.43C7.32,3.14 6.12,4.02 5.08,5.07C4.04,6.11 3.15,7.31 2.44,8.64C1.73,9.97 1.19,11.42 0.82,12.94C0.63,13.7 0.48,14.49 0.37,15.29C0.25,16.09 0.17,16.9 0.12,17.72C0.05,18.82 0.02,19.93 0.01,21.55 From b8332186715e9e9f54bd864992de28bd4306fc1e Mon Sep 17 00:00:00 2001 From: David Kimmel Date: Wed, 20 Sep 2023 19:36:06 +0000 Subject: [PATCH 3/3] Revert "Sched lib affinity and freq settings" This reverts commit 253d3d48fa4fe07b4dc39a5133659c75a807275a. Reason for revert: Scheduling while atomic b/301031609 Bug: 301031609 Change-Id: I8179a926315da55ede03653a1517f13f61f3fdeb --- conf/init.zuma.rc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index 923700d3..cb5cf40b 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -592,11 +592,6 @@ on boot chown audioserver system /sys/devices/platform/17c50000.abox/0.abox_debug/calliope_iva chown audioserver system /sys/kernel/debug/abox/log-00 - # Change sched lib affinity - write /proc/vendor_sched/sched_lib_name libunity.so - write /proc/vendor_sched/sched_lib_mask_in 0x100 - write /proc/vendor_sched/sched_lib_mask_out 0x1f0 - # Permission for USB SELECT chown system system /sys/class/android_usb/android0/enable chmod 0660 /sys/class/android_usb/android0/enable