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

Commit ba3786c1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents b7ed5b07 de2dabba

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -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();

    }



    /**