Merge "Re-root and use device remount APIs for SystemPreparer" into tm-dev

2022-04-14 16:57:17 +00:00
parent 1d0baf79bf e593837a58
commit fbf8386dc7
1 changed files with 3 additions and 2 deletions
--- a/tests/utils/hostutils/src/com/android/internal/util/test/SystemPreparer.java
+++ b/tests/utils/hostutils/src/com/android/internal/util/test/SystemPreparer.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;

 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil;

 import org.junit.Assert;
 import org.junit.ClassRule;
@@ -369,7 +368,9 @@ public class SystemPreparer extends ExternalResource {
                device.executeShellCommand("disable-verity");
                device.reboot();
            }
-            device.executeShellCommand("remount");
+            device.enableAdbRoot();
+            device.remountSystemWritable();
+            device.remountVendorWritable();
            device.waitForDeviceAvailable();
        }