commit 86aeb9ef154d7aa63c58cbe5be62e5b61d6ae5fa
author Dan Albert <danalbert@google.com> Tue Sep 09 04:02:10 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 09 04:02:10 2014 +0000
tree 75c656952bdb9600158ea6adadf902dd99656ecb
parent 51eec3b98788039afc5fd7ffe76612c7f8d9b39c
parent 8b49125f10e3fd991c631e12856ce1ebf5a56d7e

Merge "Make string literal concatenation play nice with C++11."

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index a347fa8..7a0ad2a 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -1518,7 +1518,7 @@
             continue;
         }
 
-        if (selinux_android_restorecon_pkgdir(pkgdir, seinfo, uid, flags) < 0) {
+        if (selinux_android_restorecon_pkgdir(pkgdir, seinfo, s.st_uid, flags) < 0) {
             ALOGE("restorecon failed for %s: %s\n", pkgdir, strerror(errno));
             ret |= -1;
         }