From 5096d9e13e2cdfe9f9e78ebc4e551327bfb2c171 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Wed, 9 Sep 2015 13:05:45 -0700 Subject: Don't include password on default encryption command Bug: 22989588 Change-Id: I6f5b84519cb357af8461257654e382980b874486 --- services/core/java/com/android/server/MountService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 0d64540672e4..145eafd8240d 100644 --- 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(); -- cgit v1.2.3-59-g8ed1b