From 1842b786ecef488eab4d463cce45de524add8ad0 Mon Sep 17 00:00:00 2001
From: Xiang Wang <xwxw@google.com>
Date: Wed, 23 Nov 2022 01:30:13 +0000
Subject: [PATCH] Revert "Include public GameManager unit tests in presubmit"

This reverts commit 62fbe39ad688e91991dd091ea337984124eeffa8.

Reason for revert: this module will fail in presubmit b/260071873
BUG: 260071873

Change-Id: Ic2d5637ddd451755c0f5bc1cfdd5dd5be67baa31
---
 core/java/android/app/TEST_MAPPING              | 17 -----------------
 .../java/com/android/server/app/TEST_MAPPING    | 11 -----------
 2 files changed, 28 deletions(-)

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 187eee3efdaea..ef10c0b245d1b 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -201,23 +201,6 @@
             "file_patterns": [
                 "(/|^)PropertyInvalidatedCache.java"
             ]
-        },
-        {
-            "name": "FrameworksCoreGameManagerTests",
-            "options": [
-                {
-                    "exclude-annotation": "androidx.test.filters.FlakyTest"
-                },
-                {
-                    "exclude-annotation": "org.junit.Ignore"
-                },
-                {
-                    "include-filter": "android.app"
-                }
-            ],
-            "file_patterns": [
-                "Game*\\.java"
-            ]
         }
     ],
     "presubmit-large": [
diff --git a/services/core/java/com/android/server/app/TEST_MAPPING b/services/core/java/com/android/server/app/TEST_MAPPING
index a11f73b325d5a..0ba4d8c355231 100644
--- a/services/core/java/com/android/server/app/TEST_MAPPING
+++ b/services/core/java/com/android/server/app/TEST_MAPPING
@@ -18,17 +18,6 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
-    },
-    {
-      "name": "FrameworksCoreGameManagerTests",
-      "options": [
-        {
-          "include-filter": "android.app"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
     }
   ]
 }
\ No newline at end of file