Merge "VDM TEST_MAPPING includes a wrong test class in CtsPermissionTestCases module" into main (cf7ffcf2) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/virtual/TEST_MAPPING

+8 −3

Original line number	Diff line number	Diff line
		@@ -80,9 +80,6 @@
		{
		"name": "CtsPermissionTestCases",
		"options": [
		{
		"include-filter": "android.permissionmultidevice.cts.DeviceAwarePermissionGrantTest"
		},
		{
		"include-filter": "android.permission.cts.DevicePermissionsTest"
		},
		@@ -93,6 +90,14 @@
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsPermissionMultiDeviceTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}