From 9d76c9ea038e8540ca983087aa5cfde9ada9deee Mon Sep 17 00:00:00 2001
From: Jerry Huang <huangjerry@google.com>
Date: Thu, 25 Jan 2024 11:59:31 +0000
Subject: [PATCH 1/2] zuma: update c2.android.av1-dav1d.decoder performance
 point

c2.android.av1-dav1d.decoder performance has been improved with CL
"C2SoftDav1dDec: Fix performance issues in frame parallel multi-threading"
More detail in b/315828433

Bug: 315828433
Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest --module-arg CtsMediaDecoderTestCases:instrumentation-arg:codec-prefix:=c2.android.av1-dav1d.decoder
Change-Id: I18b1179d9008ed2d2b35c8ead2606b252cf17f48
---
 media_codecs_performance_c2.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index 2f6645fc..fb148bc0 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -172,10 +172,10 @@
             <Limit name="measured-frame-rate-1280x720" range="44-54" />
          </MediaCodec>
         <MediaCodec name="c2.android.av1-dav1d.decoder" type="video/av01" update="true">
-            <Limit name="measured-frame-rate-352x288" range="233-315" />
-            <Limit name="measured-frame-rate-640x360" range="114-247" />
-            <Limit name="measured-frame-rate-720x480" range="47-189" />
-            <Limit name="measured-frame-rate-1280x720" range="44-54" />
+            <Limit name="measured-frame-rate-352x288" range="442-567" />
+            <Limit name="measured-frame-rate-640x360" range="309-431" />
+            <Limit name="measured-frame-rate-720x480" range="291-452" />
+            <Limit name="measured-frame-rate-1280x720" range="222-326" />
          </MediaCodec>
     </Decoders>
 

From ab48b5502ce6a48d13a76442cfc68f066f6e5be7 Mon Sep 17 00:00:00 2001
From: Daniel Chapin <chapin@google.com>
Date: Thu, 25 Jan 2024 21:35:37 +0000
Subject: [PATCH 2/2] Revert "dumpstate: Search the path of TCPM psy uevent"

Revert submission 25915320-320613177

Reason for revert: Droidfood blocking bug: 322294676

Reverted changes: /q/submissionid:25915320-320613177

Change-Id: I5f56d9f97d173b9971e96959b56e39207b901ac7
---
 dumpstate/dump_power.cpp | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp
index fe604c8a..a79921b1 100644
--- a/dumpstate/dump_power.cpp
+++ b/dumpstate/dump_power.cpp
@@ -152,26 +152,6 @@ void dumpAcpmStats() {
     readContentsOfDir(acpmTitle, acpmDir, statsSubStr, true, true);
 }
 
-void dumpTcpmPsyUevent() {
-    const char* tcpmPsy = "tcpm-source-psy-";
-    DIR *dir = opendir("/sys/class/power_supply/");
-    struct dirent *entry;
-
-    if (dir == NULL)
-        return;
-
-    while ((entry = readdir(dir)) != NULL) {
-        if (std::string::npos != std::string(entry->d_name).find(tcpmPsy)) {
-            std::string fullPath("/sys/class/power_supply/" + (const std::string)entry->d_name +
-                                 "/uevent");
-            dumpFileContent("Power supply property tcpm", fullPath.c_str());
-            break;
-        }
-    }
-
-    closedir(dir);
-}
-
 void dumpPowerSupplyStats() {
     const char* dumpList[][2] = {
             {"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
@@ -182,6 +162,7 @@ void dumpPowerSupplyStats() {
             {"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"},
             {"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"},
             {"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"},
+            {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-11-0025/uevent"},
             {"Power supply property usb", "/sys/class/power_supply/usb/uevent"},
             {"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"},
     };
@@ -189,8 +170,6 @@ void dumpPowerSupplyStats() {
     for (const auto &row : dumpList) {
         dumpFileContent(row[0], row[1]);
     }
-
-    dumpTcpmPsyUevent();
 }
 
 void dumpMaxFg() {