From 89a0ae43a36889b3892c5395b96994a55391a9e5 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Fri, 22 Dec 2017 10:11:10 -0800 Subject: [PATCH] Remove all references to FDE enable wipe Bug: 64766105 Test: FBE boots, forceencrypt boots, set pattern, reboots, encryptable boots and can be encrypted Change-Id: I76cc76c095cfe89bff7f2806df0f634a0b24c922 --- .../core/java/com/android/server/StorageManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 6a0d3ff92db84..1b611cf11598c 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -2201,7 +2201,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;