Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646 am: eab4352d9b

Browse Source 
am: 74a3281e9c

* commit '74a3281e9c7ec37ffcc826ee7ac8cdd4b57dfab8':
  Don't include password on default encryption command
This commit is contained in:
Paul Lawrence
2015-10-21 17:03:46 +00:00
committed by android-build-merger
parent ad7f07c95e 74a3281e9c
commit d76d1d25cb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/MountService.java
View File

@@ -2442,8 +2442,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();