From 24ce7737d945d5503aea91663bf0650f80f2ae60 Mon Sep 17 00:00:00 2001
From: Richard Chang <richardycc@google.com>
Date: Fri, 16 Sep 2022 07:11:40 +0000
Subject: [PATCH] powerhint: clean up unused hints in C10/P10

INTERACTION and LAUNCH_120FPS are removed but some actions still use them.

Bug: 246738037
Test: pts-tradefed run commandAndExit pts -m PtsPerformanceTestCases -t
com.google.android.perf.pts.PowerHintJsonVerifyTest

Change-Id: I204954dcd890c871ae6f663e0fd9ce8df37efd42
---
 powerhint-cheetah-a0.json | 15 ---------------
 powerhint-cheetah.json    | 15 ---------------
 powerhint-panther-a0.json |  5 -----
 powerhint-panther.json    |  5 -----
 4 files changed, 40 deletions(-)

diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 7130951..efda015 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -625,11 +625,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
@@ -1518,11 +1513,6 @@
       "Duration": 0,
       "Value": "63"
     },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
       "Node": "TAUClampBoost",
@@ -1541,11 +1531,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "INTERACTION"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index cfce5f4..6ae6c38 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -662,11 +662,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
@@ -1560,11 +1555,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
       "Node": "TAUClampBoost",
@@ -1583,11 +1573,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "INTERACTION"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index f272cd8..93378a4 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -1418,11 +1418,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "INTERACTION"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 6d999dd..c378c75 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -1440,11 +1440,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "INTERACTION"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",