commit 7d1e0f305f0743deb0917ce0e40bb8cc8afa3edb
author Paul Crowley <paulcrowley@google.com> Thu Mar 29 23:23:58 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 29 23:23:58 2018 +0000
tree adc06449713db126a097db4b27bd4d1378e28f28
parent ea0514ee95f8f896dbfc2b398a937b9c03bb107e
parent 385cb8c4d6766b36c52c3bf89128f5a16c88c395

Gate use of allow_encrypt_override behind ro.crypto property
am: 385cb8c4d6

Change-Id: I91f057b853902b63028897640ba6bb8e3d13e223

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 09e67af..2ab3d09 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1900,10 +1900,12 @@
     ext_crypt_ftr.keysize = cryptfs_get_keysize();
     strlcpy((char*) ext_crypt_ftr.crypto_type_name, cryptfs_get_crypto_name(),
             MAX_CRYPTO_TYPE_NAME_LEN);
+    uint32_t flags = 0;
+    if (e4crypt_is_native() &&
+        android::base::GetBoolProperty("ro.crypto.allow_encrypt_override", false))
+        flags |= CREATE_CRYPTO_BLK_DEV_FLAGS_ALLOW_ENCRYPT_OVERRIDE;
 
-    return create_crypto_blk_dev(
-        &ext_crypt_ftr, key, real_blkdev, out_crypto_blkdev, label,
-        e4crypt_is_native() ? CREATE_CRYPTO_BLK_DEV_FLAGS_ALLOW_ENCRYPT_OVERRIDE : 0);
+    return create_crypto_blk_dev(&ext_crypt_ftr, key, real_blkdev, out_crypto_blkdev, label, flags);
 }
 
 /*