Snap for 8543047 from a351a969e7 to udc-release

Change-Id: I02d4c650d1f4d45dd6b73471216ebba6706f0924
This commit is contained in:
Android Build Coastguard Worker
2022-05-05 03:02:18 +00:00
2 changed files with 13 additions and 13 deletions

View File

@@ -157,6 +157,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
WifiOverlay2023Mid WifiOverlay2023Mid
# Wifi Aware Interface
PRODUCT_PROPERTY_OVERRIDES += \
wifi.aware.interface=wifi-aware0
# Set zram size # Set zram size
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g vendor.zram.size=3g

View File

@@ -35,26 +35,22 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
std::vector<std::string> states = { std::vector<std::string> states = {
"Off", "Off",
"LP: 1080x2340@30", "LP: 1080x2400@30",
"On: 1080x2340@60", "On: 1080x2400@60",
"On: 1080x2340@90", "On: 1080x2400@90",
"HBM: 1080x2340@60", "HBM: 1080x2400@60",
"HBM: 1080x2340@90"}; "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
/*
* TODO(b/167216667): Add correct display power model here. Must read from display rail
* and include proper coefficients for display states.
*/
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", EnergyConsumerType::DISPLAY, "display", {"VSYS_PWR_DISPLAY"}, "Display",
{{"LP: 1080x2340@30", 1}, {{"LP: 1080x2400@30", 1},
{"On: 1080x2340@60", 2}, {"On: 1080x2400@60", 2},
{"On: 1080x2340@90", 3}})); {"On: 1080x2400@90", 3}}));
} }
int main() { int main() {