Snap for 8909447 from 6c46dc4099 to udc-release

Change-Id: I3ee452e1fe64f8c7681be170df1a4056277ee93a
This commit is contained in:
Android Build Coastguard Worker 2022-08-05 05:07:51 +00:00
commit 879c9ef185
3 changed files with 15 additions and 8 deletions

View file

@ -36,6 +36,7 @@ DISABLE_CAMERA_FS_AF := true
include device/google/tangorpro/audio/tangorpro/audio-tables.mk include device/google/tangorpro/audio/tangorpro/audio-tables.mk
include device/google/gs201/device-shipping-common.mk include device/google/gs201/device-shipping-common.mk
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml
$(call soong_config_set,lyric,tuning_product,cloudripper) $(call soong_config_set,lyric,tuning_product,cloudripper)
$(call soong_config_set,google3a_config,target_device,cloudripper) $(call soong_config_set,google3a_config,target_device,cloudripper)

View file

@ -0,0 +1,11 @@
<compatibility-matrix version="1.0" type="framework" level="7">
<hal format="hidl">
<name>hardware.google.bluetooth.ccc</name>
<version>1.1</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
</compatibility-matrix>

View file

@ -35,11 +35,8 @@ 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", "On: 1600x2560@60",
"On: 1080x2340@60", "HBM: 1600x2560@60"};
"On: 1080x2340@90",
"HBM: 1080x2340@60",
"HBM: 1080x2340@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",
@ -52,9 +49,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
*/ */
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
{{"LP: 1080x2340@30", 1}, {{"On: 1600x2560@60", 1}}));
{"On: 1080x2340@60", 2},
{"On: 1080x2340@90", 3}}));
} }
int main() { int main() {