Merge "Don't include password on default encryption command" into mnc-dr-dev

2015-10-21 14:27:33 +00:00
parent fde4111eea 5096d9e13e
commit 68521fd7ce
1 changed files with 7 additions and 2 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -2415,8 +2415,13 @@ class MountService extends IMountService.Stub
        }

        try {
-            mCryptConnector.execute("cryptfs", "enablecrypto", "inplace", CRYPTO_TYPES[type],
-                               new SensitiveArg(password));
+            if (type == StorageManager.CRYPT_TYPE_DEFAULT) {
+                mCryptConnector.execute("cryptfs", "enablecrypto", "inplace",
+                                CRYPTO_TYPES[type]);
+            } else {
+                mCryptConnector.execute("cryptfs", "enablecrypto", "inplace",
+                                CRYPTO_TYPES[type], new SensitiveArg(password));
+            }
        } catch (NativeDaemonConnectorException e) {
            // Encryption failed
            return e.getCode();