Merge "Don't include password on default encryption command" into mnc-dr-dev (68521fd7) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -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();