Evolution-X-Tensor/device_google_pantah
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 11373247 from 485b603473 to 24Q2-release

Browse source 
Change-Id: I908170ec3dc7abbbffe631fdafa90c9741640fa5
This commit is contained in:
Android Build Coastguard Worker 2024-01-30 02:02:54 +00:00
commit 6a5aba281f
4 changed files with 45 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device-cheetah.mk
View file

@ -336,7 +336,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=46 ro.vendor.build.svn=48
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

2
device-panther.mk
View file

@ -320,7 +320,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=46 ro.vendor.build.svn=48
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

7
powerstats/cheetah/service.cpp
View file

@ -36,6 +36,12 @@ 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
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = { std::vector<std::string> states = {
"Off", "Off",
"LP: 1440x3120@30", "LP: 1440x3120@30",
@ -55,6 +61,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"Display", "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->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(

7
powerstats/panther/service.cpp
View file

@ -34,6 +34,12 @@ 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
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = { std::vector<std::string> states = {
"Off", "Off",
"LP: 1080x2400@30", "LP: 1080x2400@30",
@ -46,6 +52,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"Display", "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->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(