Merge "Add GetDsuMetadataKeyDir()" am: adb1b891a8 am: 76621fa1e5 am: 894bccb0ba am: 5a973e9777

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452416

Change-Id: Ic258b764be1818036e685e27742579930958a001

1 files changed, 21 insertions, 0 deletions

diff --git a/include/libgsi/libgsi.h b/include/libgsi/libgsi.h
index ed47767..9a571f9 100644
--- a/include/libgsi/libgsi.h
+++ b/include/libgsi/libgsi.h
@@ -19,6 +19,7 @@
 #include <string>
 
 #include <android-base/file.h>
+#include <android-base/strings.h>
 
 namespace android {
 namespace gsi {
@@ -35,6 +36,8 @@ static constexpr char kDsuActiveFile[] = DSU_METADATA_PREFIX "active";
 
 static constexpr char kDsuAvbKeyDir[] = DSU_METADATA_PREFIX "avb/";
 
+static constexpr char kDsuMetadataKeyDirPrefix[] = "/metadata/vold/metadata_encryption/dsu/";
+
 static inline std::string DsuLpMetadataFile(const std::string& dsu_slot) {
     return DSU_METADATA_PREFIX + dsu_slot + "/lp_metadata";
 }
@@ -43,6 +46,24 @@ static inline std::string DsuInstallDirFile(const std::string& dsu_slot) {
     return DSU_METADATA_PREFIX + dsu_slot + "/install_dir";
 }
 
+static inline std::string DsuMetadataKeyDirFile(const std::string& dsu_slot) {
+    return DSU_METADATA_PREFIX + dsu_slot + "/metadata_encryption_dir";
+}
+
+static inline std::string DefaultDsuMetadataKeyDir(const std::string& dsu_slot) {
+    return kDsuMetadataKeyDirPrefix + dsu_slot;
+}
+
+static inline std::string GetDsuMetadataKeyDir(const std::string& dsu_slot) {
+    auto key_dir_file = DsuMetadataKeyDirFile(dsu_slot);
+    std::string key_dir;
+    if (android::base::ReadFileToString(key_dir_file, &key_dir) &&
+        android::base::StartsWith(key_dir, kDsuMetadataKeyDirPrefix)) {
+        return key_dir;
+    }
+    return DefaultDsuMetadataKeyDir(dsu_slot);
+}
+
 // install_dir "/data/gsi/dsu/dsu" has a slot name "dsu"
 // install_dir "/data/gsi/dsu/dsu2" has a slot name "dsu2"
 std::string GetDsuSlot(const std::string& install_dir);