From 08a7fc6c7024d6f085bd70f7a041a3ae8eeb7d58 Mon Sep 17 00:00:00 2001 From: Wasb Liu Date: Fri, 23 Dec 2022 02:38:02 +0800 Subject: [PATCH 1/2] dumpstate: dump dual batt logbuffer Add logbuffer_dual_batt to dumpstate. Also fix some dual batt related dump pathes. Bug: 263496320 Test: build pass, no related permission errors. Change-Id: Ibfd3dfc18acc049052f07246c8d85ae04b4f95f5 Signed-off-by: Wasb Liu --- conf/init.gs201.rc | 5 +++-- dumpstate/Dumpstate.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index d0e3cead..a306ae5c 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -451,10 +451,10 @@ on early-boot # Permission for logbuffer chown system system /dev/logbuffer_maxfg chown system system /dev/logbuffer_maxfg_base - chown system system /dev/logbuffer_maxfg_flip + chown system system /dev/logbuffer_maxfg_secondary chown system system /dev/logbuffer_maxfg_monitor chown system system /dev/logbuffer_maxfg_base_monitor - chown system system /dev/logbuffer_maxfg_flip_monitor + chown system system /dev/logbuffer_maxfg_secondary_monitor chown system system /dev/logbuffer_maxq chown system system /dev/logbuffer_rtx chown system system /dev/logbuffer_ssoc @@ -466,6 +466,7 @@ on early-boot chown system system /dev/logbuffer_pca9468 chown system system /dev/logbuffer_cpm chown system system /dev/logbuffer_bd + chown system system /dev/logbuffer_dual_batt on boot diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 4921ca4f..1c1bd021 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -330,12 +330,13 @@ void Dumpstate::dumpPowerSection(int fd) { DumpFileToFd(fd, "maxfg", "/dev/logbuffer_maxfg_monitor"); } else { DumpFileToFd(fd, "Power supply property maxfg_base", "/sys/class/power_supply/maxfg_base/uevent"); - DumpFileToFd(fd, "Power supply property maxfg_flip", "/sys/class/power_supply/maxfg_flip/uevent"); + DumpFileToFd(fd, "Power supply property maxfg_secondary", "/sys/class/power_supply/maxfg_secondary/uevent"); DumpFileToFd(fd, "m5_state", "/sys/class/power_supply/maxfg_base/m5_model_state"); DumpFileToFd(fd, "maxfg_base", "/dev/logbuffer_maxfg_base"); - DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip"); + DumpFileToFd(fd, "maxfg_secondary", "/dev/logbuffer_maxfg_secondary"); DumpFileToFd(fd, "maxfg_base", "/dev/logbuffer_maxfg_base_monitor"); - DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip_monitor"); + DumpFileToFd(fd, "maxfg_secondary", "/dev/logbuffer_maxfg_secondary_monitor"); + DumpFileToFd(fd, "google_dual_batt", "/dev/logbuffer_dual_batt"); } if (!stat("/dev/maxfg_history", &buffer)) { From a1b725f6fcb3cb58f7f902029528fdc38b678381 Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Fri, 13 Jan 2023 22:56:59 +0000 Subject: [PATCH 2/2] Fix widevine device.mk not found in no vendor repo Bug: 265342962 Test: git_master-without-vendor Change-Id: Ic3525cddd01a72e8c7a005818cec581a2aa25975 --- widevine/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widevine/device.mk b/widevine/device.mk index 0c66b413..4451c7c4 100644 --- a/widevine/device.mk +++ b/widevine/device.mk @@ -1,5 +1,5 @@ PRODUCT_PACKAGES += \ android.hardware.drm-service.clearkey \ -include vendor/widevine/libwvdrmengine/apex/device/device.mk +-include vendor/widevine/libwvdrmengine/apex/device/device.mk BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine \ No newline at end of file