Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 8362880 from ab8eb74252 to udc-release

Browse source 
Change-Id: I20a2f30caa0e53aade60a2b54c1113895da08cfb
This commit is contained in:
Android Build Coastguard Worker 2022-03-26 05:06:30 +00:00
commit b0f86d985b
6 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BoardConfig-common.mk
View file

@ -38,7 +38,7 @@ BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
BOARD_KERNEL_CMDLINE += cgroup_disable=memory BOARD_KERNEL_CMDLINE += cgroup_disable=memory
BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all
BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on 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 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true

6
conf/init.gs201.rc
View file

@ -803,12 +803,6 @@ on property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
setprop persist.vendor.charge.start.level 0 setprop persist.vendor.charge.start.level 0
setprop vendor.battery.defender.disable 1 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 service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs201.cfg
class main class main
user root user root

5
device.mk
View file

@ -450,10 +450,6 @@ PRODUCT_PACKAGES += \
android.hardware.graphics.allocator@4.0-impl \ android.hardware.graphics.allocator@4.0-impl \
android.hardware.graphics.allocator-V1-service android.hardware.graphics.allocator-V1-service
# AIDL memtrack
PRODUCT_PACKAGES += \
android.hardware.memtrack-service.example
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
memtrack.$(TARGET_BOARD_PLATFORM) \ memtrack.$(TARGET_BOARD_PLATFORM) \
libion_exynos \ libion_exynos \
@ -929,7 +925,6 @@ PRODUCT_PACKAGES += \
audio_amcs_ext \ audio_amcs_ext \
audio.usb.default \ audio.usb.default \
audio.usbv2.default \ audio.usbv2.default \
audio.a2dp.default \
audio.bluetooth.default \ audio.bluetooth.default \
audio.r_submix.default \ audio.r_submix.default \
audio_spk_35l41 \ audio_spk_35l41 \

4
health/Health.cpp
View file

@ -67,7 +67,9 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
#define WLC_DIR "/sys/class/power_supply/wireless" #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( static BatteryThermalControl battThermalControl(
"dev/thermal/tz-by-name/soc/mode"); "dev/thermal/tz-by-name/soc/mode");
static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV); static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);

17
powerstats/Gs201CommonDataProviders.cpp
View file

@ -136,6 +136,23 @@ void addAoC(std::shared_ptr<PowerStats> p) {
}; };
p->addStateResidencyDataProvider( p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates)); std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
// Add AoC restart count
const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {
.entryCountSupported = true,
.entryCountPrefix = "",
.totalTimeSupported = false,
.lastEntrySupported = false,
};
const std::vector<std::pair<std::string, std::string>> restartCountHeaders = {
std::make_pair("RESTART", ""),
};
std::vector<GenericStateResidencyDataProvider::PowerEntityConfig> cfgs;
cfgs.emplace_back(
generateGenericStateResidencyConfigs(restartCountConfig, restartCountHeaders),
"AoC-Count", "");
p->addStateResidencyDataProvider(std::make_unique<GenericStateResidencyDataProvider>(
"/sys/devices/platform/19000000.aoc/restart_count", cfgs));
} }
void addDvfsStats(std::shared_ptr<PowerStats> p) { void addDvfsStats(std::shared_ptr<PowerStats> p) {

10
usb/gadget/UsbGadget.cpp
View file

@ -270,9 +270,13 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) {
ret = setVidPid("0x18d1", "0x4eeb"); ret = setVidPid("0x18d1", "0x4eeb");
break; break;
case GadgetFunction::ADB | GadgetFunction::NCM: case GadgetFunction::ADB | GadgetFunction::NCM:
if (!(vendorFunctions == "user" || vendorFunctions == "")) if (vendorFunctions == "dm") {
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = setVidPid("0x04e8", "0x6862");
ret = setVidPid("0x18d1", "0x4eec"); } else {
if (!(vendorFunctions == "user" || vendorFunctions == ""))
ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str());
ret = setVidPid("0x18d1", "0x4eec");
}
break; break;
default: default:
ALOGE("Combination not supported"); ALOGE("Combination not supported");