Don't include password on default encryption command

Bug: 22989588 Change-Id: I6f5b84519cb357af8461257654e382980b874486
2015-09-09 13:05:45 -07:00
parent f57d98564b
commit 5096d9e13e
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
@@ -2409,8 +2409,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();