From 45c70632925cb5538cca72d762b5f483291738f0 Mon Sep 17 00:00:00 2001
From: Richard Chang <richardycc@google.com>
Date: Fri, 16 Sep 2022 07:36:50 +0000
Subject: [PATCH] powerhint: clean up unused hints in R4/O6

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: I6747ad6b0e953f063aad083218a86024c41999a6
---
 powerhint-oriole.json |  5 -----
 powerhint-raven.json  | 15 ---------------
 2 files changed, 20 deletions(-)

diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index ff13f2a..cbbbbae 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -1303,11 +1303,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "INTERACTION"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 2ec1508..a232909 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -504,11 +504,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "CPUBigClusterMaxFreq",
@@ -1271,11 +1266,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
       "Node": "TAUClampBoost",
@@ -1294,11 +1284,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "DISPLAY_IDLE",
-      "Type": "EndHint",
-      "Value": "INTERACTION"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Type": "EndHint",