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

Commit 95c68c60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemPreparer: remove support for FDE devices" am: 98f0a11a am: 7e0aeb84 am: 0ae29439 

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

Change-Id: Ice36d05d07c69fbd84e6a9a5f3f173769b0551c7
parents a0bd3fa3 0ae29439

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

+0 −11
Original line number Diff line number Diff line
@@ -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;

        }