Move LocaleManagerTests to presubmit suite.
Bug: 225192026
Test: atest CtsLocaleManagerTestCases
Change-Id: Iee7ad378a3d707a2d29100863164e2b9a53ec312
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 649f904..32207af 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -146,6 +146,15 @@
}
],
"file_patterns": ["(/|^)ContextImpl.java"]
+ },
+ {
+ "file_patterns": ["(/|^)LocaleManager.java"],
+ "name": "CtsLocaleManagerTestCases",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
}
],
"presubmit-large": [
@@ -173,16 +182,6 @@
{
"file_patterns": ["(/|^)ActivityThreadTest.java"],
"name": "FrameworksCoreTests"
- },
- // TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
- {
- "file_patterns": ["(/|^)LocaleManager.java"],
- "name": "CtsLocaleManagerTestCases",
- "options": [
- {
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
}
]
}
diff --git a/services/core/java/com/android/server/locales/TEST_MAPPING b/services/core/java/com/android/server/locales/TEST_MAPPING
index 160542b6..fd8cddc 100644
--- a/services/core/java/com/android/server/locales/TEST_MAPPING
+++ b/services/core/java/com/android/server/locales/TEST_MAPPING
@@ -10,10 +10,7 @@
},
{
"name": "CtsLocaleManagerHostTestCases"
- }
- ],
- "postsubmit": [
- // TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
+ },
{
"name": "CtsLocaleManagerTestCases"
}
