Merge "Remove all references to FDE enable wipe"

2018-01-08 18:59:45 +00:00
parent 379ae46d76 89a0ae43a3
commit f3f9e26cfa
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2191,7 +2191,7 @@ class StorageManagerService extends IStorageManager.Stub
        }

        try {
-            mVold.fdeEnable(type, password, IVold.ENCRYPTION_FLAG_IN_PLACE);
+            mVold.fdeEnable(type, password, 0);
        } catch (Exception e) {
            Slog.wtf(TAG, e);
            return -1;