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

Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a8a am: 7e0aeb84b0 am: 0ae29439c6 am: 95c68c6024

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

Change-Id: Id91f2a2da0f16db1a3040817cf6645543b50830d
This commit is contained in:
Treehugger Robot
2021-11-17 23:54:04 +00:00
committed by Automerger Merge Worker
parent 95ee224ba8 95c68c6024
commit f3c4457a0c
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/utils/hostutils/src/com/android/internal/util/test/SystemPreparer.java
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;
}