commit 0ff8590e78d32a38169f1a1f0156d5287f9d6162
author Yabin Cui <yabinc@google.com> Fri Jul 24 13:58:03 2015 -0700
committer Yabin Cui <yabinc@google.com> Fri Jul 24 13:58:03 2015 -0700
tree 856faecfd3ce26838cf3ebb285b339ad61b26780
parent 470df782f4efd255aa907ea7393918a6aef8aef6
parent bff406978aad1a599d01f539d0a9b5718aaceca3

resolved conflicts for merge of bff40697 to mnc-dr-dev-plus-aosp

Change-Id: I7d7a614a5eb987ef6aecd32ed15a6eaa43e93957

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 5fe67a6..7728b20 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -915,9 +915,8 @@
 }
 
 static bool is_file_crypto() {
-    char prop_value[PROP_VALUE_MAX] = {0};
-    property_get("ro.crypto.type", prop_value);
-    return strcmp(prop_value, "file") == 0;
+    std::string value = property_get("ro.crypto.type");
+    return value == "file";
 }
 
 int do_installkey(int nargs, char **args)