commit f20a16575fb7ce65d0a02ced2a5419cecf430953
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 02 19:04:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 02 19:04:12 2020 +0000
tree 7a605841ecfd8957ae39966ca90d497b35246ffd
parent d625abfda2352dc26b645ab2ebe710e7750fe9ae
parent 7fbd8d4474aae8bda674c86c08224829ed90bf5d

Merge "Record use of metadata encryption in property"

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index b97be9d..0a34007 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -337,6 +337,11 @@
 
     LOG(DEBUG) << "Mounting metadata-encrypted filesystem:" << mount_point;
     mount_via_fs_mgr(mount_point.c_str(), crypto_blkdev.c_str());
+
+    // Record that there's at least one fstab entry with metadata encryption
+    if (!android::base::SetProperty("ro.crypto.metadata.enabled", "true")) {
+        LOG(WARNING) << "failed to set ro.crypto.metadata.enabled";  // This isn't fatal
+    }
     return true;
 }