Merge "Move LocaleManagerTests to postsubmit suite." into tm-dev (7da1954f) · Commits · e / os / android_frameworks_base

core/java/android/app/TEST_MAPPING

+10 −9

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

+6 −3

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