Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29c5fb26 authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

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

am: 68521fd7

* commit '68521fd7':
  Don't include password on default encryption command
parents c37fe847 68521fd7

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();