commit 68521fd7ce5e87a4e752569b5691b75d441e8a48
author Paul Lawrence <paullawrence@google.com> Wed Oct 21 14:27:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 21 14:27:33 2015 +0000
tree 6918c21717bd26410d785fee5eb52ca6895dffe0
parent fde4111eea4b92fbc10c9d6da7eaaa349292d9ec
parent 5096d9e13e2cdfe9f9e78ebc4e551327bfb2c171

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

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 4e721da..5e67414 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -2415,8 +2415,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();