From 7f0987a3a0173e7a9079fde932eb533a30da64a9 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Wed, 3 Aug 2022 23:45:33 +0000
Subject: [PATCH 1/2] Add AIDL support on IBluetoothCcc

Bug: 239658601
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: Ia0039e1f11c59a62823c757318f04d2a36eeb034
---
 device-tangorpro.mk                 |  1 +
 device_framework_matrix_product.xml | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 device_framework_matrix_product.xml

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index a1a7ee2..e796186 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -36,6 +36,7 @@ DISABLE_CAMERA_FS_AF := true
 include device/google/tangorpro/audio/tangorpro/audio-tables.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,google3a_config,target_device,cloudripper)
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
new file mode 100644
index 0000000..c0f208c
--- /dev/null
+++ b/device_framework_matrix_product.xml
@@ -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>
+

From 905a74d1d5645a64bfaa1c85df803fedb034a1a8 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Thu, 4 Aug 2022 16:03:08 +0800
Subject: [PATCH 2/2] powerstats: update display resolution

Bug: 240550846
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I5805db02cf7c6b35f6e9347d595cadc1b09e76cf
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/service.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/powerstats/service.cpp b/powerstats/service.cpp
index 32515ee..67415a4 100644
--- a/powerstats/service.cpp
+++ b/powerstats/service.cpp
@@ -35,11 +35,8 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
     std::vector<std::string> states = {
         "Off",
-        "LP: 1080x2340@30",
-        "On: 1080x2340@60",
-        "On: 1080x2340@90",
-        "HBM: 1080x2340@60",
-        "HBM: 1080x2340@90"};
+        "On: 1600x2560@60",
+        "HBM: 1600x2560@60"};
 
     p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
             "/sys/class/backlight/panel0-backlight/state",
@@ -52,9 +49,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
      */
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
             EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
-            {{"LP: 1080x2340@30", 1},
-             {"On: 1080x2340@60", 2},
-             {"On: 1080x2340@90", 3}}));
+            {{"On: 1600x2560@60", 1}}));
 }
 
 int main() {