From 21502f2978cf214b40e0ffa78e2fcf7378c70149 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Mon, 16 May 2022 18:00:00 +0800 Subject: [PATCH 1/5] dumpstate: Dump logs Bug: 232556226 Test: log dumped in bugreport Signed-off-by: Kyle Tso Change-Id: Iacd4db38dd56c1d5ba6f58c757f023795a9c3a3b --- conf/init.gs101.rc | 1 + dumpstate/DumpstateDevice.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 669d0912..22561162 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -188,6 +188,7 @@ on init chown system system /dev/logbuffer_ttf chown system system /dev/logbuffer_tcpm chown system system /dev/logbuffer_usbpd + chown system system /dev/logbuffer_pogo_transport chown system system /dev/logbuffer_wireless chown system system /dev/logbuffer_pca9468 chown system system /dev/logbuffer_cpm diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index f5d5862c..ec3cd4f8 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -369,6 +369,7 @@ void DumpstateDevice::dumpPowerSection(int fd) { "echo \"contaminant_detection_status:\"; cat $f/contaminant_detection_status; done"}); DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd"); + DumpFileToFd(fd, "POGO Transport", "/dev/logbuffer_pogo_transport"); DumpFileToFd(fd, "PPS-google_cpm", "/dev/logbuffer_cpm"); DumpFileToFd(fd, "PPS-dc", "/dev/logbuffer_pca9468"); From faaa95c90015e9acc819a39393ada967d9fc0954 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 18 May 2022 22:08:45 -0700 Subject: [PATCH 2/5] Remove group_throttle setting Test: Build Bug: 233149512 Change-Id: I2416e5d1a401ba401407e46754fa33cacba6942d Signed-off-by: Wei Wang --- conf/init.gs101.rc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 82d00945..a64ebe07 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -761,15 +761,11 @@ on property:sys.boot_completed=1 # align it with the vendor_group setting write /proc/vendor_sched/bg_uclamp_max 512 write /dev/cpuctl/background/cpu.uclamp.max 50 - write /proc/vendor_sched/bg_group_throttle 512 write /proc/vendor_sched/sysbg_uclamp_max 512 write /dev/cpuctl/system-background/cpu.uclamp.max 50 - write /proc/vendor_sched/sysbg_group_throttle 512 write /proc/vendor_sched/dex2oat_uclamp_max 615 write /dev/cpuctl/dex2oat/cpu.uclamp.max 60 - write /proc/vendor_sched/dex2oat_group_throttle 615 write /proc/vendor_sched/ota_uclamp_max 410 - write /proc/vendor_sched/ota_group_throttle 410 # Set PMU freq limit parameters write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2 From 818f1b9d9e4fd823e3a0c5a3407c803b05cb9dd5 Mon Sep 17 00:00:00 2001 From: Michele Berionne Date: Wed, 18 May 2022 22:51:52 +0000 Subject: [PATCH 3/5] Add notification pregrant for OobConfig Bug: 232002666 Change-Id: I5f9ed54fb4e020dd98fe94198ddd6cf782cdf415 Test: manual --- default-permissions.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index 82602eef..81624d3c 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -148,5 +148,10 @@ + + + + From 9e7b96b53d00894e82d0a0d0f633cc0cbc41d8a4 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Wed, 18 May 2022 16:46:06 -0700 Subject: [PATCH 4/5] Remove android.hardware.renderscript HAL from manifest The renderscript passthrough HAL implementation (android.hardware.renderscript@1.0-impl.so) does not exist on the device, so this CL removes android.hardware.renderscript from the manifest. Bug: 231277723 Test: mma Test: presubmit Test: VtsHalRenderscriptV1_0TargetTest Change-Id: I461339ce6043a771537e95552674f4165e99e288 --- manifest_64.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest_64.xml b/manifest_64.xml index d1bc1559..d8eeb2a6 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -53,15 +53,6 @@ default - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - android.hardware.dumpstate hwbinder From d50fc07448c0710dea8a384b0f74d3357d8958de Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 18 May 2022 15:26:09 -0700 Subject: [PATCH 5/5] gralloc: Remove conditional namespace for pixel gralloc Bug: 207450311 Test: Boot to home on R4 Change-Id: I53b3cb456e524387e092c90eabdd1dcaba7ada46 --- device.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 6020e557..06a76a44 100644 --- a/device.mk +++ b/device.mk @@ -39,14 +39,13 @@ BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH) USE_PIXEL_GRALLOC := false ifeq ($(USE_PIXEL_GRALLOC),true) PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL -else - PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/gralloc4 endif PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ hardware/google/gchips \ hardware/google/graphics/common \ + hardware/google/gchips/gralloc4 \ hardware/google/graphics/gs101 \ hardware/google/interfaces \ hardware/google/pixel \