Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4e1fcb8855224929727a0d4aa7f7b1bdc3ffd8d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chiu
2022-04-14 17:40:06 +00:00
committed by Automerger Merge Worker
parent f7353459b3 fbf8386dc7
commit 44a29609cb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}