Merge "Skip boot prompt for both native and emulated FBE." into nyc-dev

2016-03-01 00:14:18 +00:00
parent b7ed5b074d de2dabbad6
commit ba3786c1e1
1 changed files with 1 additions and 2 deletions
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -896,8 +896,7 @@ public class LockPatternUtils {
     * @return true if device is file encrypted
     */
    public static boolean isFileEncryptionEnabled() {
-        final String status = SystemProperties.get("ro.crypto.type", "");
-        return "file".equalsIgnoreCase(status);
+        return StorageManager.isFileBasedEncryptionEnabled();
    }

    /**