commit 996b1f4977be40602b1addb82c3d6862a416b1b7
author Lais Andrade <lsandrade@google.com> Thu Oct 12 16:28:17 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 12 16:28:17 2023 +0000
tree 8a8c7ba53a552e027b2346c95af7507716242622
parent 3bd0c1bc45236851d3d8e5c5fcfc79cbdfca3ae0
parent ecf502ad633d683d76d397fe0e65c59576b55e11

Merge "Merge "Update haptics framework owners file" into main am: d28eacf2e1 am: 1207010906 am: fbf10c9b6f am: 4b3258363e am: a6da34a396" into main

services/inputflinger/TEST_MAPPING

diff --git a/services/inputflinger/TEST_MAPPING b/services/inputflinger/TEST_MAPPING
index ee1f3cb..6f092a6 100644
--- a/services/inputflinger/TEST_MAPPING
+++ b/services/inputflinger/TEST_MAPPING
@@ -39,6 +39,9 @@
       "options": [
         {
           "include-filter": "android.hardware.input.cts.tests"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     },