From 70fb61714611cd47ad7c709ed64b3db688c8557a Mon Sep 17 00:00:00 2001
From: Winson Chiu <chiuwinson@google.com>
Date: Wed, 5 Aug 2020 22:07:11 +0000
Subject: [PATCH] Use FULL reboot strategy for multi user uninstall tests

START_STOP is currently blocked by b/160159215

Test: atest com.android.server.pm.test.SystemStubMultiUserDisableUninstallTest

Change-Id: Iee8368c514a8d45f6453bf0b2dad2b6c4ea04dc9
---
 .../pm/test/SystemStubMultiUserDisableUninstallTest.kt       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt
index bc478b0e2c90b..207f10a3027bd 100644
--- a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt
+++ b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt
@@ -104,8 +104,11 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() {
     }
 
     private val tempFolder = TemporaryFolder()
+
+    // TODO(b/160159215): Use START_STOP rather than FULL once it's fixed. This will drastically
+    //  improve pre/post-submit times.
     private val preparer: SystemPreparer = SystemPreparer(tempFolder,
-            SystemPreparer.RebootStrategy.START_STOP, deviceRebootRule) { this.device }
+            SystemPreparer.RebootStrategy.FULL, deviceRebootRule) { this.device }
 
     @get:Rule
     val rules = RuleChain.outerRule(tempFolder).let {