| commit | d49f8c9eb7e71cfeca5d5b85016ea8113f376148 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jun 02 19:20:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 02 19:20:44 2020 +0000 |
| tree | 7a605841ecfd8957ae39966ca90d497b35246ffd | |
| parent | d625abfda2352dc26b645ab2ebe710e7750fe9ae [diff] | |
| parent | f20a16575fb7ce65d0a02ced2a5419cecf430953 [diff] |
Merge "Record use of metadata encryption in property" am: f20a16575f Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1322598 Change-Id: I7b102707853ea2556c5a24858ae43ea5c2717616
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; }