From 89d34d5ef9ac6c1ceedaadc4e00cab61fa819551 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Wed, 12 Oct 2022 00:46:40 +0800 Subject: [PATCH 1/5] init: support boot.charger_mode feature 1. If the device is powered off by users, boot to charger mode after plugging in the charger. Otherwise, boot to OS. 2. Disable this feature by default 3. Enable this feature by persist.sys.boot.charger_mode.enable=1 Bug: 251680171 Test: can enter charger mode from power off Signed-off-by: Jack Wu Change-Id: I872caa1f54fe8e17bcbcc5bc9407d0da21e83bca --- conf/init.gs201.rc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index b8ce5640..b1a39a9d 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -306,6 +306,9 @@ on init # Disable dock-defend by default chown system system /sys/devices/platform/google,charger/dd_settings write /sys/devices/platform/google,charger/dd_settings -1 + # Enable charger mode (aka off-mode charging) by default + chown system system /sys/class/power_supply/battery/charger_mode + write /sys/class/power_supply/battery/charger_mode 1 # Power Stats HAL chown system system /dev/bbd_pwrstat @@ -848,6 +851,14 @@ on property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte setprop persist.vendor.charge.start.level 0 setprop vendor.battery.defender.disable 1 +# Clear the state of charger_mode +on property:persist.vendor.charger_mode.enable=1 + write /sys/class/power_supply/battery/charger_mode 0 + +# Enable charger_mode when user triggers shutdown from menu +on property:sys.shutdown.requested=0userrequested + write /sys/class/power_supply/battery/charger_mode 1 + # on userdebug and eng builds, enable scsi error recovery log on property:ro.debuggable=1 write /sys/module/scsi_mod/parameters/scsi_logging_level 63 From a8038a817139337ec94ef690d29452972586bca6 Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Thu, 6 Oct 2022 16:55:22 +0800 Subject: [PATCH 2/5] Remove references to BOARD_BUILD_SYSTEM_ROOT_IMAGE This variable is always false or empty now. Remove it so we can mark it as deprecated later. Bug: 241346584 Test: Presubmit Change-Id: I110a1e1c07a1debd2c1ce75c70261e62eac8ec5c Merged-In: I110a1e1c07a1debd2c1ce75c70261e62eac8ec5c (cherry picked from commit f9b02ea4399a25f4dd1936a75fb02e96b5e1d554) --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 0f7c8822..96dc4cc7 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -378,9 +378,6 @@ BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000 # Build vendor kernel boot image BOARD_VENDOR_KERNEL_BOOTIMAGE_PARTITION_SIZE := 0x04000000 -# System As Root -BOARD_BUILD_SYSTEM_ROOT_IMAGE := false - # Vendor ramdisk image for kernel development BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true From a089e44eb1cef0a2ec3bc04ef17f67173268eee6 Mon Sep 17 00:00:00 2001 From: "GOOGLE\\huangaustin" Date: Thu, 13 Oct 2022 18:36:10 +0800 Subject: [PATCH 3/5] [PixelLogger][P22] Update P22 default.nprf to enable LTE_DM/DRX TC trace for Power team bug: 246867493 Change-Id: I4600e4c285f035fea1fbde7202292a8dfb87aa43 --- radio/config/default.nprf | Bin 8937 -> 8936 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/radio/config/default.nprf b/radio/config/default.nprf index b21a27e8f3e2ad31cad130b2296b7e1268ef225e..a59dd2dfff865f5538c020d6e8b9186b54b20cff 100644 GIT binary patch delta 3183 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 V2GXuRFz?=z!6G6Cav%Tz0033b{n-Ej delta 3184 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 Date: Thu, 13 Oct 2022 16:52:15 -0700 Subject: [PATCH 4/5] pixelstats: enable mitigation stats for gs201 Corresponding change to reflect changes that enable mitigation stats. Bug: 253522156 Test: Local Test. $> cmd stats print-logs $> logcat | grep Signed-off-by: George Lee Change-Id: Ia0ab4e6da0f908dbca8402db9d767577863035bd --- pixelstats/service.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 83a46727..bd8b982f 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -58,6 +58,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { }, .BlockStatsLength = BLOCK_STATS_LENGTH, .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once", + .MitigationPath = "/sys/devices/virtual/pmic/mitigation", .ThermalStatsPaths = { "/sys/devices/platform/100a0000.BIG/trip_counter", "/sys/devices/platform/100a0000.MID/trip_counter", From 2ece1b7eb1d1675d9a03029416b07f6467a54b23 Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Fri, 14 Oct 2022 13:07:53 -0600 Subject: [PATCH 5/5] Switch GLES system driver to ANGLE Test: make, flash, and run applications/tests Test: atest CtsMediaCodecTestCases:android.media.codec.cts.DecodeEditEncodeTest -- --abi arm64-v8a Bug: 218321565 Bug: 244093320 Bug: 253049434 Change-Id: I27e8bd9fcb02ebed489a30b470764177dc627f69 --- BoardConfig-common.mk | 2 +- device.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 4ba05807..a5c80ac0 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -129,7 +129,7 @@ BOARD_USES_GRALLOC_ION_SYNC := true BOARD_USES_SWIFTSHADER := false # This should be the same value as USE_ANGLE in device.mk -BOARD_USES_ANGLE := false +BOARD_USES_ANGLE := true # Gralloc4 ifeq ($(BOARD_USES_SWIFTSHADER),true) diff --git a/device.mk b/device.mk index 9a45af59..e1d0ab3d 100644 --- a/device.mk +++ b/device.mk @@ -203,7 +203,7 @@ endif USE_SWIFTSHADER := false # Must match BOARD_USES_ANGLE in BoardConfig.mk -USE_ANGLE := false +USE_ANGLE := true # HWUI TARGET_USES_VULKAN = true