Snap for 11373247 from 76d156d5cb to 24Q2-release

Change-Id: Ifd2d0eb433dab6d31df95e93bf21dfd087071258
This commit is contained in:
Android Build Coastguard Worker 2024-01-30 02:02:47 +00:00
commit 2e8eab1e7f
2 changed files with 18 additions and 11 deletions

View file

@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=31 ro.vendor.build.svn=33
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \

View file

@ -36,17 +36,24 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
std::vector<std::string> states = { struct stat buffer;
"Off", if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
"LP: 1080x2400@30", // time_in_state exists
"On: 1080x2400@60", addDisplayMrr(p);
"On: 1080x2400@90", } else {
"HBM: 1080x2400@60", // time_in_state doesn't exist
"HBM: 1080x2400@90"}; std::vector<std::string> states = {
"Off",
"LP: 1080x2400@30",
"On: 1080x2400@60",
"On: 1080x2400@90",
"HBM: 1080x2400@60",
"HBM: 1080x2400@90"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display", p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
}
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,