commit 3214d1f5a4dbece12e00f1c122e4c2e291715706
author Nick Kralevich <nnk@google.com> Wed Feb 12 23:19:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 12 23:19:02 2014 +0000
tree 33ea3bcdeab263b4e707d20c983173760d5159cd
parent 49dd24c238e86c57e97f919af7fbf8ee3d79b737
parent 3c0d02aa03118713e6e770b54d1c530ff866f156

am 3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '3c0d02aa03118713e6e770b54d1c530ff866f156':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.

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;
             }