commit a70feb449e1c64c0a09039cd087c0a3b4b333df6
author Abhijeet Kaur <abkaur@google.com> Fri Dec 13 14:03:29 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 13 14:03:29 2019 +0000
tree 494275ed9192539ae344b916b3923d047be51c3a
parent 5298ccc2a70c5d21e502302107ea9f41e9ef8b32
parent 01fa0e0d8dc0a3606faf902a4753e32a74c3889d

Merge "Replace "sys.fuse_snapshot" with "persist.sys.fuse""

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index abcf6db..3c2e0d5 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -189,7 +189,7 @@
                                       bool needs_encrypt) {
     LOG(DEBUG) << "fscrypt_mount_metadata_encrypted: " << mount_point << " " << needs_encrypt;
     auto encrypted_state = android::base::GetProperty("ro.crypto.state", "");
-    if (encrypted_state != "") {
+    if (encrypted_state != "" && encrypted_state != "encrypted") {
         LOG(DEBUG) << "fscrypt_enable_crypto got unexpected starting state: " << encrypted_state;
         return false;
     }

model/EmulatedVolume.cpp

diff --git a/model/EmulatedVolume.cpp b/model/EmulatedVolume.cpp
index d1940f0..130e747 100644
--- a/model/EmulatedVolume.cpp
+++ b/model/EmulatedVolume.cpp
@@ -56,6 +56,7 @@
     setId(StringPrintf("emulated:%u,%u;%u", major(device), minor(device), userId));
     mRawPath = rawPath;
     mLabel = fsUuid;
+    mFuseMounted = false;
 }
 
 EmulatedVolume::~EmulatedVolume() {}