SystemPreparer: remove support for FDE devices

Bug: 191796797
Change-Id: I82fd9aeb5330444436f004e8971066c253ede0cf
This commit is contained in:
Eric Biggers 2021-11-11 15:25:57 -08:00
parent 637477eb87
commit de6e672d6a

View File

@ -207,17 +207,6 @@ public class SystemPreparer extends ExternalResource {
default:
device.executeShellCommand("stop");
device.executeShellCommand("start");
ITestDevice.RecoveryMode cachedRecoveryMode = device.getRecoveryMode();
device.setRecoveryMode(ITestDevice.RecoveryMode.ONLINE);
if (device.isEncryptionSupported()) {
if (device.isDeviceEncrypted()) {
LogUtil.CLog.e("Device is encrypted after userspace reboot!");
device.unlockDevice();
}
}
device.setRecoveryMode(cachedRecoveryMode);
device.waitForDeviceAvailable();
break;
}