Merge "Check "Secure start-up" before toggling emulation." into nyc-dev

2016-03-21 21:10:33 +00:00
parent 8953147400 5a78516897
commit 3dc7c04d80
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -1946,6 +1946,10 @@ class MountService extends IMountService.Stub
                throw new IllegalStateException(
                        "Emulation not available on device with native FBE");
            }
+            if (mLockPatternUtils.isCredentialRequiredToDecrypt(false)) {
+                throw new IllegalStateException(
+                        "Emulation requires disabling 'Secure start-up' in Settings > Security");
+            }

            final long token = Binder.clearCallingIdentity();
            try {