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

Browse Source 
am: 29c5fb2646

* commit '29c5fb2646dd0bc0f2fa8b3b98f0893d7d57469b':
  Don't include password on default encryption command
This commit is contained in:
Paul Lawrence
2015-10-21 15:00:58 +00:00
committed by android-build-merger
parent 03c5ec76d6 29c5fb2646
commit eab4352d9b
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

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