From 86f071737662a329d5187fa17fd8c3f33c098793 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Tue, 27 Feb 2024 03:05:52 +0000
Subject: [PATCH] Revert "Disable auto prefer idle if ta prefer_idle is
 explictly disabled"

This reverts commit 34a3e400b9097a04cefba80e5ae3616c514be6a0.

Reason for revert: to avoid potential power regression

Bug: 326507991
Change-Id: Id4e9de4b8b86702d796e553fa663d220c2e8a42a
Test: build pass
---
 perf/powerhint-husky.json      | 30 ------------------------------
 perf/powerhint-ripcurrent.json | 30 ------------------------------
 perf/powerhint-shiba.json      | 30 ------------------------------
 3 files changed, 90 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 6383f39..e88b40f 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -1196,12 +1196,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1724,12 +1718,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1892,12 +1880,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -2174,12 +2156,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2601,12 +2577,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "GAME",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index f174bd7..0eb4107 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -1195,12 +1195,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1585,12 +1579,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1741,12 +1729,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1999,12 +1981,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2360,12 +2336,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "GAME",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 363df9a..2b7d5e1 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -1202,12 +1202,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1628,12 +1622,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1790,12 +1778,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDPreferIdle",
@@ -2078,12 +2060,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2493,12 +2469,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "GAME",
-      "Node": "ReducePreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",