commit 409c083781f27b2924f051e8f7d130f62921ce1b
author Paul Crowley <paulcrowley@google.com> Wed Apr 27 23:45:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 23:45:26 2016 +0000
tree 18d10b7948a9ca73ed3a0e6285ab95fdf5035b57
parent c1428a51c3d343814e683e2e9864a5cfee6836a0
parent b3de337acd7ad07de1ed30d24fdfd628d1d8590b

Use a longer timeout on the disk encryption keys
am: b3de337

* commit 'b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
  Use a longer timeout on the disk encryption keys

Change-Id: Ie66bea62ccc5d8066a12b9a7acf26dafa4b2eaa3

Android.mk

diff --git a/Android.mk b/Android.mk
index fb5e23e..a0aa0e7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,6 +51,7 @@
 	liblogwrap \
 	libext4_utils \
 	libf2fs_sparseblock \
+	libcrypto_utils \
 	libcrypto \
 	libselinux \
 	libutils \
@@ -66,7 +67,6 @@
 	libfec_rs \
 	libsquashfs_utils \
 	libscrypt_static \
-	libmincrypt \
 	libbatteryservice \
 
 vold_conlyflags := -std=c11

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 7ae22c5..c287797 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -211,7 +211,7 @@
     for (auto line : output) {
         // Extract values from blkid output, if defined
         const char* cline = line.c_str();
-        char* start = strstr(cline, "TYPE=");
+        const char* start = strstr(cline, "TYPE=");
         if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
             fsType = value;
         }