commit 7d86b45472898373bbe3ef03286b66d71ea82b79
author Dianne Hackborn <hackbod@android.com> Fri Feb 14 01:45:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 01:45:28 2014 +0000
tree a5070fb90c55d30c8beba927d349b3f758f0dd02
parent 2044ac43e53b517526b3c70dc4fbc60ffc01693f
parent 07a47281504a59a888e744f461c42f97fd2f0e64

Merge "frameworks/native: move idmap to frameworks/base"

cmds/dumpstate/utils.c

diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index fe716ac..670e09c 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -469,7 +469,7 @@
         if (!mkdir(anr_traces_dir, 0775)) {
             chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM);
             chmod(anr_traces_dir, 0775);
-            if (selinux_android_restorecon(anr_traces_dir) == -1) {
+            if (selinux_android_restorecon(anr_traces_dir, 0) == -1) {
                 fprintf(stderr, "restorecon failed for %s: %s\n", anr_traces_dir, strerror(errno));
             }
         } else if (errno != EEXIST) {

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index e4f63e2..ef063e7 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -91,7 +91,7 @@
         return -1;
     }
 
-    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {
+    if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {
         ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
         unlink(libsymlink);
         unlink(pkgdir);
@@ -245,7 +245,7 @@
         return -1;
     }
 
-    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {
+    if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {
         ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
         unlink(libsymlink);
         unlink(pkgdir);

cmds/installd/installd.c

diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index 9c66f2d..549aaab 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -398,7 +398,7 @@
             goto fail;
         }
 
-        if (selinux_android_restorecon(android_media_dir.path)) {
+        if (selinux_android_restorecon(android_media_dir.path, 0)) {
             goto fail;
         }