From 23ee662458cb29a1bae8468e004bedc6bee2aca0 Mon Sep 17 00:00:00 2001
From: Midas Chien <midaschieh@google.com>
Date: Fri, 12 Jan 2024 07:15:40 +0000
Subject: [PATCH 1/2] powerstats: update MRR refresh rate residency node path

Refresh rate residency is not directly related to backlight state.
Relocate to a more appropriate location.

Bug: 315424658
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: Ife9e8e0c362c11342d83e35df0a6c3f3e4919aa9
---
 powerstats/husky/service.cpp | 2 +-
 powerstats/shiba/service.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/powerstats/husky/service.cpp b/powerstats/husky/service.cpp
index 2e69292..a2f8d14 100644
--- a/powerstats/husky/service.cpp
+++ b/powerstats/husky/service.cpp
@@ -35,7 +35,7 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
     struct stat buffer;
-    if (stat("/sys/class/backlight/panel0-backlight/time_in_state", &buffer)) {
+    if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
         // time_in_state doesn't exist
         std::vector<std::string> states = {
             "Off",
diff --git a/powerstats/shiba/service.cpp b/powerstats/shiba/service.cpp
index a4c695c..440f6b8 100644
--- a/powerstats/shiba/service.cpp
+++ b/powerstats/shiba/service.cpp
@@ -35,7 +35,7 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
     struct stat buffer;
-    if (stat("/sys/class/backlight/panel0-backlight/time_in_state", &buffer)) {
+    if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
         // time_in_state doesn't exist
         std::vector<std::string> states = {
             "Off",

From 5d25fd6017ccca2366a9c88693f3474ec694b7c6 Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Wed, 10 Jan 2024 05:56:09 +0000
Subject: [PATCH 2/2] add immersive output for ble devices

Bug: 320225632
Test: manual

Change-Id: Ic552fcfa3ab7ee45c06a986aebaf093a1256eaa4
Signed-off-by: Yung Ti Su <andysu@google.com>
---
 audio/husky/aidl_config/mixer_paths_aidl.xml | 8 ++++++++
 audio/shiba/aidl_config/mixer_paths_aidl.xml | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 06e0b54..bce93ea 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -842,6 +842,14 @@
     <path name="immersive-playback -> bt" />
   </path>
 
+  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 06e0b54..bce93ea 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -842,6 +842,14 @@
     <path name="immersive-playback -> bt" />
   </path>
 
+  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>