commit 84294d8e53d3175ef89f03aa76bfced32563df16
author Bill Yi <byi@google.com> Mon Apr 19 19:32:58 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 19 19:32:58 2021 +0000
tree c4eeb61b3643863b7532b8ed246288f80dfdf249
parent 1b9651cc7893c902044ad0e7a0f5d2dc0286bbe5
parent 2d01a224c24225d308e0213888a2a113274f6016

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f163c17a17 -s ours am: 882b6c2ead -s ours am: 2d01a224c2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/14232841

Change-Id: Id26d422f6207bd3c0b9d7a467b5f0d76d5bf2ec9

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 75b9d49..da61c80 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,6 +10,46 @@
     },
     {
       "name": "CarrierAppIntegrationTestCases"
+    },
+    {
+      "name": "CtsTelephonySdk28TestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsSimRestrictedApisTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsTelephony2TestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsTelephony3TestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsTelephonyProviderTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
     }
   ]
 }