Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f55 am: 131d03d6bf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0bd75b8a65fc39288a6f92e8d5473060ccbd95

tests/StagedInstallTest/StagedInstallInternalTest.xml

@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <configuration description="Runs the internal staged install tests">
-    <option name="test-suite-tag" value="StagedInstallTest" />
+    <option name="test-suite-tag" value="StagedInstallInternalTest" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="StagedInstallInternalTestApp.apk" />

tests/StagedInstallTest/TEST_MAPPING

@@ -1,5 +1,15 @@
 {
   "presubmit": [
+    {
+      "name": "StagedInstallInternalTest",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.LargeTest"
+        }
+      ]
+    }
+  ],
+  "postsubmit": [
     {
       "name": "StagedInstallInternalTest"
     }

tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java

@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
 import android.cts.install.lib.host.InstallUtilsHost;
+import android.platform.test.annotations.LargeTest;
 
 import com.android.ddmlib.Log;
 import com.android.tests.rollback.host.AbandonSessionsRule;
@@ -145,6 +146,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test {
 
     // Test rollback-app command waits for staged sessions to be ready
     @Test
+    @LargeTest
     public void testAdbRollbackAppWaitsForStagedReady() throws Exception {
         assumeTrue("Device does not support updating APEX",
                 mHostUtils.isApexUpdateSupported());