commit e0eb65ed7b07100eefcfecb68717c65f3dd5f5af
author Pratyush More <pratyushmore@google.com> Wed Nov 10 09:04:32 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 10 09:04:32 2021 +0000
tree f659106752f9d434123e69b44642000d265ec64c
parent 98c7b477c9284495ef34885cb638ae0eb4fc67cd
parent 2e02b9d131a52636bc5380e00c4aaaf34e566903

Merge changes I1bada812,Ia50e462d

* changes:
  Automatically run LocaleManager CTS cases for relevant changes.
  Automatically run LocaleManager CTS cases for relevant changes.

core/java/android/app/TEST_MAPPING

diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 31c81be..32207af 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -146,6 +146,15 @@
                 }
             ],
             "file_patterns": ["(/|^)ContextImpl.java"]
+        },
+        {
+            "file_patterns": ["(/|^)LocaleManager.java"],
+            "name": "CtsLocaleManagerTestCases",
+            "options": [
+                {
+                    "exclude-annotation": "androidx.test.filters.FlakyTest"
+                }
+            ]
         }
     ],
     "presubmit-large": [

services/core/java/com/android/server/locales/TEST_MAPPING

diff --git a/services/core/java/com/android/server/locales/TEST_MAPPING b/services/core/java/com/android/server/locales/TEST_MAPPING
index 72b9c48..097c2bc 100644
--- a/services/core/java/com/android/server/locales/TEST_MAPPING
+++ b/services/core/java/com/android/server/locales/TEST_MAPPING
@@ -7,6 +7,9 @@
           "include-filter": "com.android.server.locales."
         }
       ]
+    },
+    {
+      "name": "CtsLocaleManagerTestCases"
     }
   ]
 }
\ No newline at end of file