Merge "Move LocaleManagerTests to presubmit suite." into tm-dev (722c06c1) · Commits · e / os / android_frameworks_base

core/java/android/app/TEST_MAPPING

+9 −10

Original line number	Diff line number	Diff line
		@@ -159,6 +159,15 @@
		}
		],
		"file_patterns": ["(/\|^)ContextImpl.java"]
		},
		{
		"file_patterns": ["(/\|^)LocaleManager.java"],
		"name": "CtsLocaleManagerTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		],
		"presubmit-large": [
		@@ -186,16 +195,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"
		}
		]
		}
		]
		}

+1 −4

Original line number	Diff line number	Diff line
		@@ -10,10 +10,7 @@
		},
		{
		"name": "CtsLocaleManagerHostTestCases"
		}
		],
		"postsubmit": [
		// TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
		},
		{
		"name": "CtsLocaleManagerTestCases"
		}