diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2015-12-08 01:35:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-08 01:35:28 +0000 |
| commit | e0b2f2e270ae14b9deaaa31acd7ef535ff963e32 (patch) | |
| tree | a3cd92618eb7668895e6416cd098fb799e222ca4 /core/java | |
| parent | 0ca88260694262928bf4b980667e82ab27e55572 (diff) | |
| parent | ce14cd01411c384b3b979a9f662bf3cd5f9e7183 (diff) | |
Merge "Mount storage after unlock, fix leaving emulation."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index db1256409cb7..7f36a9866eb7 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1021,8 +1021,17 @@ public class StorageManager { /** {@hide} */ public static boolean isFileBasedEncryptionEnabled() { - return "file".equals(SystemProperties.get("ro.crypto.type", "none")) - || SystemProperties.getBoolean(StorageManager.PROP_EMULATE_FBE, false); + return isNativeFileBasedEncryptionEnabled() || isEmulatedFileBasedEncryptionEnabled(); + } + + /** {@hide} */ + public static boolean isNativeFileBasedEncryptionEnabled() { + return "file".equals(SystemProperties.get("ro.crypto.type", "none")); + } + + /** {@hide} */ + public static boolean isEmulatedFileBasedEncryptionEnabled() { + return SystemProperties.getBoolean(StorageManager.PROP_EMULATE_FBE, false); } /** {@hide} */ |