Snap for 11373247 from a17bd159c4
to 24Q2-release
Change-Id: I46a98d8174ecc4711042e67690cc723f3feb17c6
This commit is contained in:
commit
50c0756cd3
2 changed files with 41 additions and 27 deletions
|
@ -220,7 +220,7 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
|
|
||||||
# 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=39
|
ro.vendor.build.svn=41
|
||||||
|
|
||||||
# Vibrator HAL
|
# Vibrator HAL
|
||||||
PRODUCT_VENDOR_PROPERTIES +=\
|
PRODUCT_VENDOR_PROPERTIES +=\
|
||||||
|
|
|
@ -38,36 +38,50 @@ 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 for inner display
|
// Add display residency stats for inner display
|
||||||
std::vector<std::string> inner_states = {
|
struct stat primaryBuffer;
|
||||||
"Off",
|
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &primaryBuffer)) {
|
||||||
"LP: 1840x2208@1",
|
// time_in_state exists
|
||||||
"LP: 1840x2208@30",
|
addDisplayMrrByEntity(p, "Inner Display", "/sys/class/drm/card0/device/primary-panel/");
|
||||||
"On: 1840x2208@1",
|
} else {
|
||||||
"On: 1840x2208@10",
|
// time_in_state doesn't exist
|
||||||
"On: 1840x2208@60",
|
std::vector<std::string> inner_states = {
|
||||||
"On: 1840x2208@120",
|
"Off",
|
||||||
"HBM: 1840x2208@60",
|
"LP: 1840x2208@1",
|
||||||
"HBM: 1840x2208@120"};
|
"LP: 1840x2208@30",
|
||||||
|
"On: 1840x2208@1",
|
||||||
|
"On: 1840x2208@10",
|
||||||
|
"On: 1840x2208@60",
|
||||||
|
"On: 1840x2208@120",
|
||||||
|
"HBM: 1840x2208@60",
|
||||||
|
"HBM: 1840x2208@120"};
|
||||||
|
|
||||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||||
"Inner Display",
|
"Inner Display",
|
||||||
"/sys/class/backlight/panel0-backlight/state",
|
"/sys/class/backlight/panel0-backlight/state",
|
||||||
inner_states));
|
inner_states));
|
||||||
|
}
|
||||||
|
|
||||||
// Add display residency stats for outer display
|
// Add display residency stats for outer display
|
||||||
std::vector<std::string> outer_states = {
|
struct stat secondaryBuffer;
|
||||||
"Off",
|
if (!stat("/sys/class/drm/card0/device/secondary-panel/time_in_state", &secondaryBuffer)) {
|
||||||
"LP: 1080x2092@30",
|
// time_in_state exists
|
||||||
"On: 1080x2092@10",
|
addDisplayMrrByEntity(p, "Outer Display", "/sys/class/drm/card0/device/secondary-panel/");
|
||||||
"On: 1080x2092@60",
|
} else {
|
||||||
"On: 1080x2092@120",
|
// time_in_state doesn't exist
|
||||||
"HBM: 1080x2092@60",
|
std::vector<std::string> outer_states = {
|
||||||
"HBM: 1080x2092@120"};
|
"Off",
|
||||||
|
"LP: 1080x2092@30",
|
||||||
|
"On: 1080x2092@10",
|
||||||
|
"On: 1080x2092@60",
|
||||||
|
"On: 1080x2092@120",
|
||||||
|
"HBM: 1080x2092@60",
|
||||||
|
"HBM: 1080x2092@120"};
|
||||||
|
|
||||||
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
|
||||||
"Outer Display",
|
"Outer Display",
|
||||||
"/sys/class/backlight/panel1-backlight/state",
|
"/sys/class/backlight/panel1-backlight/state",
|
||||||
outer_states));
|
outer_states));
|
||||||
|
}
|
||||||
|
|
||||||
// Add display energy consumer
|
// Add display energy consumer
|
||||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
|
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue