Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp" into jb-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Kenny Root
2012-10-17 10:51:25 -07:00
committed by Android (Google) Code Review
parent 0307bb5de2 367400491a
commit 63a183c41f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmds/installd/commands.c
View File

@@ -71,13 +71,20 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
return -1;
}
if (selinux_android_setfilecon(libsymlink, pkgname, uid) < 0) {
if (selinux_android_setfilecon(libsymlink, pkgname, AID_SYSTEM) < 0) {
ALOGE("cannot setfilecon dir '%s': %s\n", libsymlink, strerror(errno));
unlink(libsymlink);
unlink(pkgdir);
return -1;
}
if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {
ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
unlink(libsymlink);
unlink(pkgdir);
return -errno;
}
if (chown(pkgdir, uid, gid) < 0) {
ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));
unlink(libsymlink);