commit 5096d9e13e2cdfe9f9e78ebc4e551327bfb2c171
author Paul Lawrence <paullawrence@google.com> Wed Sep 09 13:05:45 2015 -0700
committer Paul Lawrence <paullawrence@google.com> Wed Sep 09 13:05:45 2015 -0700
tree cee0937446849b72243d367ce1043ed4ba4b3432
parent f57d98564b26953b722ab0e14222f50e6515f36d

Don't include password on default encryption command

Bug: 22989588
Change-Id: I6f5b84519cb357af8461257654e382980b874486

services/core/java/com/android/server/MountService.java

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 0d64540..145eafd 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -2409,8 +2409,13 @@
         }
 
         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();