Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev am: cfa03d4a4c am: 269bdbcab1

am: b0f2d02d49

* commit 'b0f2d02d49dcb526426b2b590a53b80ff47c785d':
  e4crypt_is_native has been moved into system/extras.

Change-Id: Ib6e4a66c0081439670b6b03fd8939d911faf14d3

Ext4Crypt.cpp

@@ -25,7 +25,6 @@
 #include <sstream>
 #include <string>
 
-#include <cutils/properties.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -59,7 +58,7 @@ static constexpr int FLAG_STORAGE_DE = 1 << 0;
 static constexpr int FLAG_STORAGE_CE = 1 << 1;
 
 namespace {
-const std::string device_key_dir = std::string() + DATA_MNT_POINT + "/unencrypted";
+const std::string device_key_dir = std::string() + DATA_MNT_POINT + e4crypt_unencrypted_folder;
 const std::string device_key_path = device_key_dir + "/key";
 const std::string device_key_temp = device_key_dir + "/temp";
 
@@ -93,13 +92,6 @@ struct ext4_encryption_key {
 };
 }
 
-// TODO replace with proper function to test for file encryption
-bool e4crypt_is_native() {
-    char value[PROPERTY_VALUE_MAX];
-    property_get("ro.crypto.type", value, "none");
-    return !strcmp(value, "file");
-}
-
 static bool e4crypt_is_emulated() {
     return property_get_bool("persist.sys.emulate_fbe", false);
 }