commit 931f15d050d268619c3c9103b080009435267d69
author Paul Lawrence <paullawrence@google.com> Fri Feb 14 15:24:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 14 15:24:13 2014 +0000
tree 323a70f496da5bb441b8e84eae6d624b6b6d7e18
parent 5773f9e6dac00ef1a9a08cbfb6a2d42337d2f60c
parent f4faa575c9fc20a8a8e133d6098865b5ce3a7ed2

Merge "Support default, pattern, pin and password encryption types"

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 95263a8..1ffa939 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -646,7 +646,7 @@
                 result |= fchmod(fd, privateFile ? 0640 : 0644);
             }
 
-            if (selinux_android_restorecon(ftsent->fts_path) < 0) {
+            if (selinux_android_restorecon(ftsent->fts_path, 0) < 0) {
                 SLOGE("restorecon failed for %s: %s\n", ftsent->fts_path, strerror(errno));
                 result |= -1;
             }

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 4dd7a6b..b320ee2 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -54,6 +54,8 @@
 
 #define UNUSED __attribute__((unused))
 
+#define UNUSED __attribute__((unused))
+
 #define DM_CRYPT_BUF_SIZE 4096
 
 #define HASH_COUNT 2000