Snap for 12327203 from 8d194cb38c to 24Q4-release

Change-Id: I4e81e69ee1c37701d346325cde55a27aafa1e947
This commit is contained in:
Android Build Coastguard Worker 2024-09-05 23:01:46 +00:00
commit 71bb36c14a
6 changed files with 15 additions and 50 deletions

View file

@ -1,3 +1,4 @@
import /vendor/etc/init/hw/init.gs201.storage.rc
import /vendor/etc/init/hw/init.gs201.usb.rc
import android.hardware.drm@1.2-service.widevine.rc
import init.exynos.sensorhub.rc

View file

@ -11,7 +11,7 @@ on post-fs-data
mkdir /data/vendor/slog 0771 system system
# Modem extended log folder
mkdir /data/vendor/radio/extended_logs 0770 radio system
mkdir /data/vendor/radio/extended_logs 0771 radio system
# Modem MDS log folder
mkdir /data/vendor/radio/mds 0771 radio system

View file

@ -356,6 +356,14 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc
ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
device/google/gs201/storage/5.10/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
else
PRODUCT_COPY_FILES += \
device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \

View file

@ -117,7 +117,6 @@ void dumpAcpmStats() {
void dumpPowerSupplyStats() {
const char* dumpList[][2] = {
{"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
{"GENPD summary", "/d/pm_genpd/pm_genpd_summary"},
{"Power supply property battery", "/sys/class/power_supply/battery/uevent"},
{"Power supply property dc", "/sys/class/power_supply/dc/uevent"},
{"Power supply property gcpm", "/sys/class/power_supply/gcpm/uevent"},
@ -292,53 +291,6 @@ void dumpBatteryDefend() {
files.clear();
}
}
void dumpChgUserDebug() {
std::vector<std::string> files;
struct dirent *entry;
std::string content;
const char *chgUserDebug [][2] {
{"DC_registers dump", "/sys/class/power_supply/dc-mains/device/registers_dump"},
{"max77759_chg registers dump", "/d/max77759_chg/registers"},
{"max77729_pmic registers dump", "/d/max77729_pmic/registers"},
{"Charging table dump", "/d/google_battery/chg_raw_profile"},
};
const std::string debugfs = "/d/";
const char *maxFgStrMatch = "maxfg";
const char *fgInfo [][2] {
{"fg_model", "fg_model"},
{"fg_alo_ver", "algo_ver"},
{"fg_model_ok", "model_ok"},
{"fg registers", "registers"},
{"Maxim FG NV RAM", "nv_registers"},
};
if (!isUserBuild())
return;
for (auto &row : chgUserDebug) {
dumpFileContent(row[0], row[1]);
}
for (auto &info : fgInfo) {
DIR *dir = opendir(debugfs.c_str());
if (dir == NULL)
return;
printTitle(info[0]);
while ((entry = readdir(dir)) != NULL)
if (std::string(entry->d_name).find(maxFgStrMatch) != std::string::npos)
files.push_back(entry->d_name);
closedir(dir);
sort(files.begin(), files.end());
for (auto &file : files) {
std::string fileDirectory = debugfs + file;
std::string fileLocation = fileDirectory + "/" + std::string(info[1]);
if (!android::base::ReadFileToString(fileLocation, &content)) {
content = "\n";
}
printf("%s:\n%s", fileDirectory.c_str(), content.c_str());
if (content.back() != '\n')
printf("\n");
}
files.clear();
}
}
void dumpBatteryEeprom() {
const char *title = "Battery EEPROM";
const char *files[] {
@ -710,7 +662,6 @@ int main() {
dumpLn8411();
dumpBatteryHealth();
dumpBatteryDefend();
dumpChgUserDebug();
dumpBatteryEeprom();
dumpChargerStats();
dumpWlcLogs();

View file

@ -0,0 +1,3 @@
on init
write /sys/block/sda/queue/scheduler bfq
write /sys/block/sda/queue/iosched/slice_idle 0

View file

@ -0,0 +1,2 @@
on init
write /sys/block/sda/queue/scheduler mq-deadline