Snap for 11361184 from 512b9b17d8
to 24Q2-release
Change-Id: I51b8f4e92f3e99fb95121e638f492195ec052080
This commit is contained in:
commit
9cc04f45a4
2 changed files with 26 additions and 5 deletions
|
@ -76,7 +76,7 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
hardware/google/pixel \
|
hardware/google/pixel \
|
||||||
device/google/zuma \
|
device/google/zuma \
|
||||||
device/google/zuma/powerstats \
|
device/google/zuma/powerstats \
|
||||||
system/chre/host/hal_generic \
|
vendor/google_devices/common/chre/host/hal \
|
||||||
vendor/google/whitechapel/tools \
|
vendor/google/whitechapel/tools \
|
||||||
vendor/google/interfaces \
|
vendor/google/interfaces \
|
||||||
vendor/google_devices/common/proprietary/confirmatioui_hal \
|
vendor/google_devices/common/proprietary/confirmatioui_hal \
|
||||||
|
@ -389,7 +389,8 @@ PRODUCT_PACKAGES += \
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
chre_power_test_client \
|
chre_power_test_client \
|
||||||
chre_test_client
|
chre_test_client \
|
||||||
|
chre_aidl_hal_client
|
||||||
endif
|
endif
|
||||||
|
|
||||||
## HAL
|
## HAL
|
||||||
|
@ -398,10 +399,9 @@ PRODUCT_COPY_FILES += \
|
||||||
frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml
|
frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml
|
||||||
|
|
||||||
## Enable the CHRE Daemon
|
## Enable the CHRE Daemon
|
||||||
CHRE_USF_DAEMON_ENABLED := true
|
CHRE_USF_DAEMON_ENABLED := false
|
||||||
CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true
|
CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
chre \
|
|
||||||
preloaded_nanoapps.json
|
preloaded_nanoapps.json
|
||||||
|
|
||||||
# Filesystem management tools
|
# Filesystem management tools
|
||||||
|
|
|
@ -152,6 +152,26 @@ void dumpAcpmStats() {
|
||||||
readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true);
|
readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void dumpTcpmPsyUevent() {
|
||||||
|
const char* tcpmPsy = "tcpm-source-psy-";
|
||||||
|
DIR *dir = opendir("/sys/class/power_supply/");
|
||||||
|
struct dirent *entry;
|
||||||
|
|
||||||
|
if (dir == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
while ((entry = readdir(dir)) != NULL) {
|
||||||
|
if (std::string::npos != std::string(entry->d_name).find(tcpmPsy)) {
|
||||||
|
std::string fullPath("/sys/class/power_supply/" + (const std::string)entry->d_name +
|
||||||
|
"/uevent");
|
||||||
|
dumpFileContent("Power supply property tcpm", fullPath.c_str());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
closedir(dir);
|
||||||
|
}
|
||||||
|
|
||||||
void dumpPowerSupplyStats() {
|
void dumpPowerSupplyStats() {
|
||||||
const char* dumpList[][2] = {
|
const char* dumpList[][2] = {
|
||||||
{"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
|
{"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
|
||||||
|
@ -162,7 +182,6 @@ void dumpPowerSupplyStats() {
|
||||||
{"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"},
|
{"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"},
|
||||||
{"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"},
|
{"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"},
|
||||||
{"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"},
|
{"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"},
|
||||||
{"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-11-0025/uevent"},
|
|
||||||
{"Power supply property usb", "/sys/class/power_supply/usb/uevent"},
|
{"Power supply property usb", "/sys/class/power_supply/usb/uevent"},
|
||||||
{"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"},
|
{"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"},
|
||||||
};
|
};
|
||||||
|
@ -170,6 +189,8 @@ void dumpPowerSupplyStats() {
|
||||||
for (const auto &row : dumpList) {
|
for (const auto &row : dumpList) {
|
||||||
dumpFileContent(row[0], row[1]);
|
dumpFileContent(row[0], row[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dumpTcpmPsyUevent();
|
||||||
}
|
}
|
||||||
|
|
||||||
void dumpMaxFg() {
|
void dumpMaxFg() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue