From de2dabbad69ff905d30bb4148a26a5d51c5a1a4d Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 29 Feb 2016 17:12:34 -0700
Subject: [PATCH] Skip boot prompt for both native and emulated FBE.

Bug: 27412530
Change-Id: I53d39392ccab54cb79cf6cc1e51923ad7b5a3b0c
---
 core/java/com/android/internal/widget/LockPatternUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index cbc735fc065c2..795012dab4d13 100644
--- 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();
     }
 
     /**