diff options
| -rw-r--r-- | core/java/android/app/TEST_MAPPING | 17 | ||||
| -rw-r--r-- | core/tests/GameManagerTests/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/app/TEST_MAPPING | 17 |
3 files changed, 37 insertions, 1 deletions
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING index ef10c0b245d1..f133c8aa5899 100644 --- a/core/java/android/app/TEST_MAPPING +++ b/core/java/android/app/TEST_MAPPING @@ -201,6 +201,23 @@ "file_patterns": [ "(/|^)PropertyInvalidatedCache.java" ] + }, + { + "name": "FrameworksCoreGameManagerTests", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + }, + { + "include-filter": "android.app" + } + ], + "file_patterns": [ + "(/|^)GameManager[^/]*", "(/|^)GameMode[^/]*" + ] } ], "presubmit-large": [ diff --git a/core/tests/GameManagerTests/AndroidManifest.xml b/core/tests/GameManagerTests/AndroidManifest.xml index 6a01abee3e1c..f1ab6969e99f 100644 --- a/core/tests/GameManagerTests/AndroidManifest.xml +++ b/core/tests/GameManagerTests/AndroidManifest.xml @@ -17,7 +17,9 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.app.gamemanagertests" - android:sharedUserId="android.uid.system" > + android:sharedUserId="com.android.uid.test" > + + <uses-permission android:name="android.permission.MANAGE_GAME_MODE" /> <application android:appCategory="game"> <uses-library android:name="android.test.runner" /> diff --git a/services/core/java/com/android/server/app/TEST_MAPPING b/services/core/java/com/android/server/app/TEST_MAPPING index 0ba4d8c35523..feb2b4fc6850 100644 --- a/services/core/java/com/android/server/app/TEST_MAPPING +++ b/services/core/java/com/android/server/app/TEST_MAPPING @@ -18,6 +18,23 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "FrameworksCoreGameManagerTests", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + }, + { + "include-filter": "android.app" + } + ], + "file_patterns": [ + "(/|^)GameManagerService.java", "(/|^)GameManagerSettings.java" + ] } ] }
\ No newline at end of file |