From aff08c6facb5cae2d113ea1861b6531bed88bdf3 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Wed, 29 Nov 2023 23:39:54 +0000
Subject: [PATCH 1/2] Update bluejay SVN to 55

Bug: 313797924
Change-Id: Ie828075b65f51b1bb8109c0a330542b0f620b7ca
(cherry picked from commit 2cc93e92b32250493222818e2a8add1aeb8e1505)
Merged-In: Ie828075b65f51b1bb8109c0a330542b0f620b7ca
---
 device-bluejay.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index ccdf081..d052c55 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=54
+    ro.vendor.build.svn=55
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \

From 04a4c33897c1608b939f0ada7edf75e2592ef881 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Mon, 29 Jan 2024 11:39:54 +0800
Subject: [PATCH 2/2] powerstats: use display MRR state residency data provider

Bug: 322717818
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I67e9659e37bd34100a6be5d6352f4dc6341d628b
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/bluejay/service.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/powerstats/bluejay/service.cpp b/powerstats/bluejay/service.cpp
index 2138fa3..8d639a5 100644
--- a/powerstats/bluejay/service.cpp
+++ b/powerstats/bluejay/service.cpp
@@ -34,17 +34,24 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
-    std::vector<std::string> states = {
-        "Off",
-        "LP: 1080x2400@30",
-        "On: 1080x2400@60",
-        "HBM: 1080x2400@60",
-    };
+    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 = {
+            "Off",
+            "LP: 1080x2400@30",
+            "On: 1080x2400@60",
+            "HBM: 1080x2400@60",
+        };
 
-    p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
-            "Display",
-            "/sys/class/backlight/panel0-backlight/state",
-            states));
+        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
+                "Display",
+                "/sys/class/backlight/panel0-backlight/state",
+                states));
+    }
 
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(