From 835a35fc9044997b976ac2fa8a7b8727490de2fb Mon Sep 17 00:00:00 2001
From: Yuting <yutingfang@google.com>
Date: Wed, 3 Apr 2024 14:56:39 -0700
Subject: [1/2] Add relevant tests in VDM to presubmit test of permission code

Some of VDM CTS tests are related to permissions. Include those tests in the presubmit test of permission code to prevent test breakage from
changing permission code.

We need to add these tests to postsubmit first for them to meet presubmit SLO following this guide:go/test-mapping-slo-guide.

Bug: 332764290
Test: run atest in the directory frameworks/base/services/permission to
trigger presubmit run and verified VDM tests were running.

Change-Id: Id2ddff2fabd23cfa93ed6bff8478b2521e79467f
---
 core/java/android/permission/TEST_MAPPING | 24 ++++++++++++++++++++++++
 services/permission/TEST_MAPPING          | 22 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/core/java/android/permission/TEST_MAPPING b/core/java/android/permission/TEST_MAPPING
index 69113ef8f946..a15d9bc1b485 100644
--- a/core/java/android/permission/TEST_MAPPING
+++ b/core/java/android/permission/TEST_MAPPING
@@ -11,5 +11,29 @@
                 }
             ]
         }
+    ],
+    "postsubmit": [
+        {
+            "name": "CtsVirtualDevicesAudioTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                },
+                {
+                    "include-filter": "android.virtualdevice.cts.audio.VirtualAudioPermissionTest"
+                }
+            ]
+        },
+        {
+            "name": "CtsVirtualDevicesAppLaunchTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                },
+                {
+                    "include-filter": "android.virtualdevice.cts.applaunch.VirtualDevicePermissionTest"
+                }
+            ]
+        }
     ]
 }
\ No newline at end of file
diff --git a/services/permission/TEST_MAPPING b/services/permission/TEST_MAPPING
index 00bfcd3007a4..4de4a56aa806 100644
--- a/services/permission/TEST_MAPPING
+++ b/services/permission/TEST_MAPPING
@@ -103,6 +103,28 @@
                     "include-filter": "android.permission.cts.PermissionMaxSdkVersionTest"
                 }
             ]
+        },
+        {
+            "name": "CtsVirtualDevicesAudioTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                },
+                {
+                    "include-filter": "android.virtualdevice.cts.audio.VirtualAudioPermissionTest"
+                }
+            ]
+        },
+        {
+            "name": "CtsVirtualDevicesAppLaunchTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                },
+                {
+                    "include-filter": "android.virtualdevice.cts.applaunch.VirtualDevicePermissionTest"
+                }
+            ]
         }
     ],
     "imports": [
-- 
cgit v1.2.3-59-g8ed1b