Merge "Move package parsing equivalence tests to postsubmit"

services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt

@@ -20,7 +20,7 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageParser
-import android.platform.test.annotations.Presubmit
+import android.platform.test.annotations.Postsubmit
 import com.android.server.pm.parsing.AndroidPackageInfoFlagBehaviorTest.Companion.Param.Companion.appInfo
 import com.android.server.pm.parsing.AndroidPackageInfoFlagBehaviorTest.Companion.Param.Companion.pkgInfo
 import com.android.server.pm.parsing.pkg.AndroidPackage
@@ -38,7 +38,7 @@ import org.junit.runners.Parameterized
  * This test has to be updated manually whenever the info generation behavior changes, since
  * there's no single place where flag -> field is defined besides this test.
  */
-@Presubmit
+@Postsubmit
 @RunWith(Parameterized::class)
 class AndroidPackageInfoFlagBehaviorTest : AndroidPackageParsingTestBase() {
 

services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingEquivalenceTest.kt

@@ -17,25 +17,19 @@
 package com.android.server.pm.parsing
 
 import android.content.pm.PackageManager
-import android.platform.test.annotations.Presubmit
+import android.platform.test.annotations.Postsubmit
 import androidx.test.filters.LargeTest
 import com.google.common.truth.Expect
-
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.Timeout
-import java.util.concurrent.TimeUnit
 
 /**
  * Collects APKs from the device and verifies that the new parsing behavior outputs
  * the same exposed Info object as the old parsing logic.
  */
-@Presubmit
+@Postsubmit
 class AndroidPackageParsingEquivalenceTest : AndroidPackageParsingTestBase() {
 
-    @get:Rule
-    val timeout = Timeout(4, TimeUnit.MINUTES)
-
     @get:Rule
     val expect = Expect.create()