From 1940a1f1576edc2bb6eb34bf84da9dad5aae0090 Mon Sep 17 00:00:00 2001
From: Jay Thomas Sullivan <jaysullivan@google.com>
Date: Fri, 28 Jul 2023 13:17:40 -0700
Subject: [PATCH] Exclude flaky from internal/infra/TEST_MAPPING

Bug: 288468003
Bug: 293492320
Test: cd into this dir, then "atest :presubmit", "atest:postsubmit", etc
Change-Id: I413a84bd56a7c918bfea6fcc0662a8bee30975ae
---
 .../java/com/android/internal/infra/TEST_MAPPING | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/infra/TEST_MAPPING b/core/java/com/android/internal/infra/TEST_MAPPING
index 3de107e892b67..ddfd0ed18bef7 100644
--- a/core/java/com/android/internal/infra/TEST_MAPPING
+++ b/core/java/com/android/internal/infra/TEST_MAPPING
@@ -1,14 +1,22 @@
 {
   "presubmit": [
     {
-      "name": "CtsRoleTestCases"
+      "name": "CtsRoleTestCases",
+      "options": [
+          {
+              "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+          }
+      ]
     },
     {
       "name": "CtsPermissionTestCases",
       "options": [
-        {
-          "include-filter": "android.permission.cts.PermissionControllerTest"
-        }
+          {
+            "include-filter": "android.permission.cts.PermissionControllerTest"
+          },
+          {
+            "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+          }
       ]
     },
     {