From 08e96c68016d2bec177f88cd6eac4fdde7898103 Mon Sep 17 00:00:00 2001
From: Corina Grigoras <corinac@google.com>
Date: Thu, 20 Jan 2022 16:02:13 +0000
Subject: Enable mainline presubmit

Since module from master can now be installed on released versions

Bug: 185553751
Bug: 204107787
Change-Id: I95b05a36660a87a6e47a84dfb6491b87e38f614c
Test: Presubmit
---
 TEST_MAPPING | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'TEST_MAPPING')

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2fc29df8b..6d5973591 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,25 +1,29 @@
 {
-    // TODO(b/204107787): Re-enable this once MP from master can be installed on R and S devices
-    // "mainline-presubmit": [
-    //     {
-    //         "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
-    //     }
-    //     {
-    //         "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
-    //     },
-    //     {
-    //         "name": "CtsScopedStorageCoreHostTest"
-    //     },
-    //     {
-    //         "name": "CtsScopedStorageHostTest"
-    //     },
-    //     {
-    //         "name": "CtsScopedStorageDeviceOnlyTest"
-    //     },
-    //    {
-    //        "name": "CtsMediaProviderTranscodeTests[com.google.android.mediaprovider.apex]"
-    //    }
-    // ],
+    "mainline-presubmit": [
+        {
+            "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
+        },
+        {
+            "name": "CtsScopedStorageCoreHostTest[com.google.android.mediaprovider.apex]"
+        },
+        {
+            "name": "CtsScopedStorageHostTest[com.google.android.mediaprovider.apex]"
+        },
+        {
+            "name": "CtsScopedStorageDeviceOnlyTest[com.google.android.mediaprovider.apex]"
+        },
+        {
+            "name": "CtsMediaProviderTranscodeTests[com.google.android.mediaprovider.apex]"
+        },
+        {
+            "name": "CtsPhotoPickerTest[com.google.android.mediaprovider.apex]",
+            "options": [
+              {
+                "exclude-annotation": "androidx.test.filters.LargeTest"
+              }
+            ]
+        }
+    ],
     "presubmit": [
         {
             "name": "MediaProviderTests"
-- 
cgit v1.2.3-59-g8ed1b