From 771e98b1e5ba3614aec6657ca6851f21e7ffc611 Mon Sep 17 00:00:00 2001
From: Patrick Baumann <patb@google.com>
Date: Mon, 27 Mar 2023 20:36:02 +0000
Subject: [PATCH] Disable non-reboot tests

This change fixes a build issue that was resulting in the TestActivity
being unavailable at runtime and removes the non-reboot variants of
SdCardEjectionTests until we can find a better way to detect when the
APKs on the SD card are no longer available.

Test: atest SdCardEjectionTests
Fixes: 274719632
Bug: 275403538
Change-Id: I88bd67ba5bd8ae6e4008072a5e98d1ad67085c74
---
 .../server/pm/test/SdCardEjectionTests.kt     | 12 ++-------
 .../host/test-apps/Generic/Android.bp         | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt
index 9f9e6a310d0ba..d8139623f3933 100644
--- a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt
+++ b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt
@@ -57,7 +57,8 @@ class SdCardEjectionTests : BaseHostJUnit4Test() {
 
         @Parameterized.Parameters(name = "reboot={0}")
         @JvmStatic
-        fun parameters() = arrayOf(false, true)
+        // TODO(b/275403538): re-enable non-reboot scenarios with better tracking of APK removal
+        fun parameters() = arrayOf(/*false, */true)
 
         data class Volume(
             val diskId: String,
@@ -200,15 +201,6 @@ class SdCardEjectionTests : BaseHostJUnit4Test() {
             // TODO: There must be a better way to prevent it from auto-mounting.
             removeVirtualDisk()
             device.reboot()
-        } else {
-            // Because PackageManager unmount scan is asynchronous, need to retry until the package
-            // has been unloaded. This only has to be done in the non-reboot case. Reboot will
-            // clear the data structure by its nature.
-            retryUntilSuccess {
-                // The compiler section will print the state of the physical APK
-                HostUtils.packageSection(device, pkgName, sectionName = "Compiler stats")
-                        .any { it.contains("Unable to find package: $pkgName") }
-            }
         }
     }
 
diff --git a/services/tests/PackageManagerServiceTests/host/test-apps/Generic/Android.bp b/services/tests/PackageManagerServiceTests/host/test-apps/Generic/Android.bp
index 1cc7ccc012830..5cc3371a1a6e9 100644
--- a/services/tests/PackageManagerServiceTests/host/test-apps/Generic/Android.bp
+++ b/services/tests/PackageManagerServiceTests/host/test-apps/Generic/Android.bp
@@ -24,30 +24,45 @@ package {
 android_test_helper_app {
     name: "PackageManagerTestAppStub",
     manifest: "AndroidManifestVersion1.xml",
-    srcs: []
+    srcs: [],
 }
 
 android_test_helper_app {
     name: "PackageManagerTestAppVersion1",
-    manifest: "AndroidManifestVersion1.xml"
+    manifest: "AndroidManifestVersion1.xml",
+    srcs: [
+        "src/**/*.kt",
+    ],
 }
 
 android_test_helper_app {
     name: "PackageManagerTestAppVersion2",
-    manifest: "AndroidManifestVersion2.xml"
+    manifest: "AndroidManifestVersion2.xml",
+    srcs: [
+        "src/**/*.kt",
+    ],
 }
 
 android_test_helper_app {
     name: "PackageManagerTestAppVersion3",
-    manifest: "AndroidManifestVersion3.xml"
+    manifest: "AndroidManifestVersion3.xml",
+    srcs: [
+        "src/**/*.kt",
+    ],
 }
 
 android_test_helper_app {
     name: "PackageManagerTestAppVersion4",
-    manifest: "AndroidManifestVersion4.xml"
+    manifest: "AndroidManifestVersion4.xml",
+    srcs: [
+        "src/**/*.kt",
+    ],
 }
 
 android_test_helper_app {
     name: "PackageManagerTestAppOriginalOverride",
-    manifest: "AndroidManifestOriginalOverride.xml"
+    manifest: "AndroidManifestOriginalOverride.xml",
+    srcs: [
+        "src/**/*.kt",
+    ],
 }