commit a0025a89738fb8cca1eddb75f85e2e57266f0cbf
author The Android Automerger <android-build@google.com> Mon Jul 13 01:02:34 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Jul 13 01:02:34 2015 -0700
tree 28dab85bdb511b6c3d28d2a1cd2716fe72d45b55
parent ccaca5cb8971837afe96f5b2940d266a95efd564
parent 951b7ce0f6e4d88e72f5d7e3a75412cad7e27cc8

merge in mnc-dr-release history after reset to mnc-dr-dev

ext4_utils/ext4_crypt_init_extensions.cpp

diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp
index 3fb04b9..e1b69e1 100644
--- a/ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/ext4_utils/ext4_crypt_init_extensions.cpp
@@ -142,10 +142,15 @@
     if (!dir || strncmp(dir, "/data/", 6) || strchr(dir + 6, '/')) {
         return 0;
     }
+    // ext4enc:TODO exclude /data/user with a horrible special case.
+    if (!strcmp(dir, "/data/user")) {
+        return 0;
+    }
 
     UnencryptedProperties props("/data");
     std::string policy = props.Get<std::string>(properties::ref);
     if (policy.empty()) {
+        // ext4enc:TODO why is this OK?
         return 0;
     }
 

ext4_utils/unencrypted_properties.cpp

diff --git a/ext4_utils/unencrypted_properties.cpp b/ext4_utils/unencrypted_properties.cpp
index d873e91..ed36e20 100644
--- a/ext4_utils/unencrypted_properties.cpp
+++ b/ext4_utils/unencrypted_properties.cpp
@@ -84,6 +84,7 @@
 
 bool UnencryptedProperties::Remove(const char* name)
 {
+    if (!OK()) return false;
     if (remove((folder_ + "/" + name).c_str())
         && errno != ENOENT) {
         return false;