commit e27c67047eadb425b9a4b17d60a6a7b83691598f
author Dan Shi <dshi@google.com> Sat Oct 05 03:36:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 05 03:36:43 2019 +0000
tree 8f39a914d2706ce070af7aed29828ac3432d2197
parent ef6b15ab2d138e2f54f380e3e6faa2c959cc3969
parent c3a7effa7fd07368eaf07be4da482d57d425f471

Merge changes Idccade48,I3213bc92

* changes:
  Move CtsDevicePolicyManagerTestCases to its own group
  Sync TEST_MAPPING files from master branch

src/com/android/packageinstaller/permission/service/TEST_MAPPING

diff --git a/src/com/android/packageinstaller/permission/service/TEST_MAPPING b/src/com/android/packageinstaller/permission/service/TEST_MAPPING
index 3de5d73..8790a5a 100644
--- a/src/com/android/packageinstaller/permission/service/TEST_MAPPING
+++ b/src/com/android/packageinstaller/permission/service/TEST_MAPPING
@@ -23,6 +23,19 @@
             ]
         }
     ],
+    "presubmit-devicepolicy": [
+        {
+            "name": "CtsDevicePolicyManagerTestCases",
+            "options": [
+                {
+                    "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest"
+                },
+                {
+                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+                }
+            ]
+        }
+    ],
     "postsubmit": [
         {
             "name": "CtsPermissionTestCases",
@@ -34,32 +47,6 @@
                     "exclude-annotation": "androidx.test.filters.FlakyTest"
                 }
             ]
-        },
-        {
-            "name": "CtsDevicePolicyManagerTestCases",
-            "options": [
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrant"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionMixedPolicies"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantPreMApp"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTestApi25#testPermissionGrantPreMApp"
-                },
-                {
-                    "exclude-annotation": "androidx.test.filters.FlakyTest"
-                }
-            ]
         }
     ]
-}
\ No newline at end of file
+}

src/com/android/packageinstaller/permission/ui/TEST_MAPPING

diff --git a/src/com/android/packageinstaller/permission/ui/TEST_MAPPING b/src/com/android/packageinstaller/permission/ui/TEST_MAPPING
index 4ab861f..b7fcffb 100644
--- a/src/com/android/packageinstaller/permission/ui/TEST_MAPPING
+++ b/src/com/android/packageinstaller/permission/ui/TEST_MAPPING
@@ -1,4 +1,17 @@
 {
+    "presubmit-devicepolicy": [
+        {
+            "name": "CtsDevicePolicyManagerTestCases",
+            "options": [
+                {
+                    "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest"
+                },
+                {
+                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+                }
+            ]
+        }
+    ],
     "postsubmit": [
         {
             "name": "CtsAppSecurityHostTestCases",
@@ -7,32 +20,6 @@
                     "include-filter": "android.appsecurity.cts.PermissionsHostTest"
                 }
             ]
-        },
-        {
-            "name": "CtsDevicePolicyManagerTestCases",
-            "options": [
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantOfDisallowedPermissionWhileOtherPermIsGranted"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrant"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionMixedPolicies"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionGrantPreMApp"
-                },
-                {
-                    "include-filter": "com.android.cts.devicepolicy.MixedManagedProfileOwnerTestApi25#testPermissionGrantPreMApp"
-                }
-            ]
         }
     ]
-}
\ No newline at end of file
+}