commit 17fb1210a9a6f554f0cc990e0555d936a7aa6498
author mauronofrio matarrese <poronofrio@gmail.com> Mon May 25 19:59:17 2020 +0200
committer bigbiff <bigbiff@teamw.in> Tue Jun 23 14:43:47 2020 +0000
tree b90a4610a38b338e40cff27c64d2fa17505b7db8
parent 7982032fcdbfb32bfc61f67cf73da1430dba652e

Rework is_wrapped_key_supported_common

Importing is_wrapped_key_supported_common from android-9.0 branch

Change-Id: I7a13b40e365a984a90a661e6c2c71cfa5b725a11

crypto/fscrypt/FsCrypt.cpp

diff --git a/crypto/fscrypt/FsCrypt.cpp b/crypto/fscrypt/FsCrypt.cpp
index 28e7747..46df2b6 100755
--- a/crypto/fscrypt/FsCrypt.cpp
+++ b/crypto/fscrypt/FsCrypt.cpp
@@ -211,20 +211,15 @@
 }
 
 static bool is_wrapped_key_supported_common(const std::string& mount_point) {
-    struct fstab_rec* rec = fs_mgr_get_entry_for_mount_point(fstab_default, mount_point);
-    char const* contents_mode = NULL;
-    char const* filenames_mode = NULL;
-
-    fs_mgr_get_file_encryption_modes(rec, &contents_mode, &filenames_mode);
-    if (!contents_mode || !filenames_mode) {
-        LOG(ERROR) << "Couldn't read file or contents mode, returning false";
+    LOG(DEBUG) << "Determining wrapped-key support for " << mount_point;
+    std::string wrapped_key_supported = android::base::GetProperty("fbe.data.wrappedkey", "false");
+    LOG(DEBUG) << "fbe.data.wrappedkey = " << wrapped_key_supported;
+    if (mount_point == DATA_MNT_POINT && wrapped_key_supported == "true") {
+        LOG(DEBUG) << "Wrapped key supported on " << mount_point;
+        return true;
+    } else {
         return false;
     }
-
-    if (strcmp(contents_mode, "ice_wrapped_key_supported") == 0)
-        return true;
-    else
-        return false;
 }
 
 bool is_wrapped_key_supported() {