Merge "Only run flaky permissions test in postsubmit (frameworks/base)" into main (7f385ed5) · Commits · e / os / android_frameworks_base

core/java/android/app/TEST_MAPPING

+10 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,12 @@
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "CtsAppOpsTestCases"
		"name": "CtsAppOpsTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		}
		]
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		@@ -263,6 +268,10 @@
		{
		"file_patterns": ["(/\|^)ActivityThreadTest.java"],
		"name": "FrameworksCoreTests"
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "CtsAppOpsTestCases"
		}
		]
		}

+12 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@
		"exclude-annotation": "org.junit.Ignore"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		},
		{
		"include-filter": "android.permissionui.cts.CameraMicIndicatorsPermissionTest"
		@@ -110,6 +110,17 @@
		]
		}
		],
		"postsubmit": [
		{
		// Permission indicators
		"name": "CtsPermissionUiTestCases",
		"options": [
		{
		"include-filter": "android.permissionui.cts.CameraMicIndicatorsPermissionTest"
		}
		]
		}
		],
		"silver-sysui": [
		{
		"name": "PlatformScenarioTests",

+31 −1

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsAppOpsTestCases"
		"name": "CtsAppOpsTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		}
		]
		},
		{
		"name": "CtsAppOps2TestCases"
		@@ -25,6 +30,9 @@
		{
		"name": "CtsPermissionTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		},
		{
		"include-filter": "android.permission.cts.BackgroundPermissionsTest"
		},
		@@ -55,5 +63,27 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		"name": "CtsAppOpsTestCases"
		},
		{
		"name": "CtsPermissionTestCases",
		"options": [
		{
		"include-filter": "android.permission.cts.BackgroundPermissionsTest"
		},
		{
		"include-filter": "android.permission.cts.SplitPermissionTest"
		},
		{
		"include-filter": "android.permission.cts.PermissionFlagsTest"
		},
		{
		"include-filter": "android.permission.cts.SharedUidPermissionsTest"
		}
		]
		}
		]
		}

+29 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,9 @@
		{
		"name": "CtsPermissionTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		},
		{
		"include-filter": "android.permission.cts.BackgroundPermissionsTest"
		},
		@@ -28,6 +31,9 @@
		{
		"name": "CtsPermissionPolicyTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		},
		{
		"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
		},
		@@ -59,6 +65,29 @@
		"options": [
		{
		"include-filter": "android.permission.cts.PermissionUpdateListenerTest"
		},
		{
		"include-filter": "android.permission.cts.BackgroundPermissionsTest"
		},
		{
		"include-filter": "android.permission.cts.SplitPermissionTest"
		},
		{
		"include-filter": "android.permission.cts.PermissionFlagsTest"
		},
		{
		"include-filter": "android.permission.cts.SharedUidPermissionsTest"
		}
		]
		},
		{
		"name": "CtsPermissionPolicyTestCases",
		"options": [
		{
		"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
		},
		{
		"include-filter": "android.permission.cts.PermissionMaxSdkVersionTest"
		}
		]
		}

+31 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,9 @@
		{
		"name": "CtsPermissionPolicyTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		},
		{
		"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
		},
		@@ -45,6 +48,9 @@
		{
		"name": "CtsPermissionTestCases",
		"options": [
		{
		"exclude-annotation": "android.platform.test.annotations.FlakyTest"
		},
		{
		"include-filter": "android.permission.cts.SplitPermissionTest"
		},
		@@ -78,6 +84,31 @@
		"include-filter": "com.android.server.policy."
		}
		]
		},
		{
		"name": "CtsPermissionPolicyTestCases",
		"options": [
		{
		"include-filter": "android.permissionpolicy.cts.RestrictedPermissionsTest"
		},
		{
		"include-filter": "android.permissionpolicy.cts.RestrictedStoragePermissionSharedUidTest"
		},
		{
		"include-filter": "android.permissionpolicy.cts.RestrictedStoragePermissionTest"
		}
		]
		},
		{
		"name": "CtsPermissionTestCases",
		"options": [
		{
		"include-filter": "android.permission.cts.SplitPermissionTest"
		},
		{
		"include-filter": "android.permission.cts.BackgroundPermissionsTest"
		}
		]
		}
		]
		}