From 576864b7c18d3b1c140965df2401cdbf380b8f72 Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Fri, 4 Mar 2022 13:30:50 +0000 Subject: [PATCH 1/6] Removed audio A2dp and Hearing Aid from device.mk Bug: 220306859 Test: atest Tag: #feature Change-Id: I7c882558519968fffd460896d8ce2bd133be35c2 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index f61e594c..49ef35c9 100644 --- a/device.mk +++ b/device.mk @@ -929,7 +929,6 @@ PRODUCT_PACKAGES += \ audio_amcs_ext \ audio.usb.default \ audio.usbv2.default \ - audio.a2dp.default \ audio.bluetooth.default \ audio.r_submix.default \ audio_spk_35l41 \ From ee38fc11224bbe5a1e2cf506cbee6420f4642ec5 Mon Sep 17 00:00:00 2001 From: Ken Tsou Date: Thu, 3 Mar 2022 17:09:08 +0800 Subject: [PATCH 2/6] battery: Enable Battery Defender Sync with ag/14540731 to fix the wrong path. BatteryDefender: Failed to write /sys/devices/platform/soc/soc:google,charger/charge_start_level BatteryDefender: Failed to write /sys/devices/platform/soc/soc:google,charger/charge_stop_level Bug: 222008498 Change-Id: I4782e2c387b147fc48cf4134d27af8675964dc44 Signed-off-by: Ken Tsou --- conf/init.gs201.rc | 6 ------ health/Health.cpp | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 593c91e2..c0351a46 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -805,12 +805,6 @@ 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 -on property:persist.vendor.charge.stop.level=* - write /sys/devices/platform/google,charger/charge_stop_level ${persist.vendor.charge.stop.level} - -on property:persist.vendor.charge.start.level=* - write /sys/devices/platform/google,charger/charge_start_level ${persist.vendor.charge.start.level} - service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs201.cfg class main user root diff --git a/health/Health.cpp b/health/Health.cpp index d4030631..453c151a 100644 --- a/health/Health.cpp +++ b/health/Health.cpp @@ -67,7 +67,9 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"}; #define WLC_DIR "/sys/class/power_supply/wireless" -static BatteryDefender battDefender(WLC_DIR "/present"); +static BatteryDefender battDefender(WLC_DIR "/present", + "/sys/devices/platform/google,charger/charge_start_level", + "/sys/devices/platform/google,charger/charge_stop_level"); static BatteryThermalControl battThermalControl( "dev/thermal/tz-by-name/soc/mode"); static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV); From 552c4032235673b721e98b9d8ec26196326d0c87 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 25 Mar 2022 11:15:23 +0800 Subject: [PATCH 3/6] remove cuttlefish memtrack implementation Bug: 225788729 Test: build ROM with the daemon gone Change-Id: Ibe739256c6967e373a465e3ca9e7b42f61496fb0 --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 49ef35c9..84423dd6 100644 --- a/device.mk +++ b/device.mk @@ -450,10 +450,6 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.allocator@4.0-impl \ android.hardware.graphics.allocator-V1-service -# AIDL memtrack -PRODUCT_PACKAGES += \ - android.hardware.memtrack-service.example - PRODUCT_PACKAGES += \ memtrack.$(TARGET_BOARD_PLATFORM) \ libion_exynos \ From 6bfa5980f97d3d55679fb77c12d7521c2c33d4e9 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 24 Mar 2022 08:16:01 +0800 Subject: [PATCH 4/6] powerstats: add AoC restart count stats Bug: 226173008 Test: dump power stats and verify restart count increased Change-Id: I8fabb1ccf853ad26c4f455129f6d337e8eb37e2c Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 77cedf14..6232a6e0 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -136,6 +136,23 @@ void addAoC(std::shared_ptr p) { }; p->addStateResidencyDataProvider( std::make_unique(monitorIds, monitorStates)); + + // Add AoC restart count + const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { + .entryCountSupported = true, + .entryCountPrefix = "", + .totalTimeSupported = false, + .lastEntrySupported = false, + }; + const std::vector> restartCountHeaders = { + std::make_pair("RESTART", ""), + }; + std::vector cfgs; + cfgs.emplace_back( + generateGenericStateResidencyConfigs(restartCountConfig, restartCountHeaders), + "AoC-Count", ""); + p->addStateResidencyDataProvider(std::make_unique( + "/sys/devices/platform/19000000.aoc/restart_count", cfgs)); } void addDvfsStats(std::shared_ptr p) { From 7d413565cd99456d37b14289f80e780d1d47395d Mon Sep 17 00:00:00 2001 From: Ricky Niu Date: Fri, 25 Mar 2022 14:38:33 +0800 Subject: [PATCH 5/6] usb: Add dm condition in NCM Add vid/pid 04e8/6862 for dm condition in NCM Test: The usb gadget functions work normally Bug: 226682477 Signed-off-by: Ricky Niu Change-Id: I263f125d2ff961a6967b5b536c71fcbdcd87ed05 --- usb/gadget/UsbGadget.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 9fdf2acc..2a1e16c5 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -270,9 +270,13 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) { ret = setVidPid("0x18d1", "0x4eeb"); break; case GadgetFunction::ADB | GadgetFunction::NCM: - if (!(vendorFunctions == "user" || vendorFunctions == "")) - ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x4eec"); + if (vendorFunctions == "dm") { + ret = setVidPid("0x04e8", "0x6862"); + } else { + if (!(vendorFunctions == "user" || vendorFunctions == "")) + ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); + ret = setVidPid("0x18d1", "0x4eec"); + } break; default: ALOGE("Combination not supported"); From 3bcb448aea75bb170c21dc3da3b0e3656542d815 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Fri, 25 Mar 2022 12:19:53 +0800 Subject: [PATCH 6/6] Keep minimium amount of swiotlb Keep 2MB swiotlb for devices that not support 36bit access. Bug: 226578178 Test: boot Signed-off-by: Martin Liu Change-Id: I88deb288e326880b0328c06f5d1b32777cc1ccb9 --- BoardConfig-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index eebe31c6..5ae062cd 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -38,7 +38,7 @@ BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += cgroup_disable=memory BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on -BOARD_KERNEL_CMDLINE += swiotlb=noforce +BOARD_KERNEL_CMDLINE += swiotlb=1024 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs TARGET_NO_BOOTLOADER := true