Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38e6eebe authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

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

Merge "Re-root and use device remount APIs for SystemPreparer" into tm-dev am: fbf8386d am: 6e1c2330

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



Change-Id: I618bb5f00ab5d7ba2a0ea36c0944b0f84cd64b61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3403449c 6e1c2330

tests/utils/hostutils/src/com/android/internal/util/test/SystemPreparer.java

+3 −2
Original line number Diff line number Diff line
@@ -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();

        }