diff options
| author | Nick Kralevich <nnk@google.com> | 2012-07-20 10:00:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-20 10:00:45 -0700 |
| commit | b8acd060d409f0e81ab3510b429cb86d3f34adb8 (patch) | |
| tree | c962d2494558d8805147879ef7e6d6d81eae8f00 /cmds | |
| parent | a56d273438036d79e770efd0e436449534ee8b9b (diff) | |
| parent | fa6e1ea773a74aa6a996a783ff16c495ab3cc822 (diff) | |
| download | frameworks_base-b8acd060d409f0e81ab3510b429cb86d3f34adb8.zip frameworks_base-b8acd060d409f0e81ab3510b429cb86d3f34adb8.tar.gz frameworks_base-b8acd060d409f0e81ab3510b429cb86d3f34adb8.tar.bz2 | |
am fa6e1ea7: am 2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"
* commit 'fa6e1ea773a74aa6a996a783ff16c495ab3cc822':
s/LOG/ALOG/ in HAVE_SELINUX blocks
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index f5f6f3b..5878619 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -79,7 +79,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid) #ifdef HAVE_SELINUX if (selinux_android_setfilecon(libdir, pkgname, AID_SYSTEM) < 0) { - LOGE("cannot setfilecon dir '%s': %s\n", libdir, strerror(errno)); + ALOGE("cannot setfilecon dir '%s': %s\n", libdir, strerror(errno)); unlink(libdir); unlink(pkgdir); return -errno; @@ -95,7 +95,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid) #ifdef HAVE_SELINUX if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) { - LOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); + ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); unlink(libdir); unlink(pkgdir); return -errno; @@ -202,7 +202,7 @@ int make_user_data(const char *pkgname, uid_t uid, uid_t persona) #ifdef HAVE_SELINUX if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) { - LOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); + ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); unlink(pkgdir); return -errno; } @@ -404,7 +404,7 @@ int protect(char *pkgname, gid_t gid) #ifdef HAVE_SELINUX if (selinux_android_setfilecon(pkgpath, pkgname, s.st_uid) < 0) { - LOGE("cannot setfilecon dir '%s': %s\n", pkgpath, strerror(errno)); + ALOGE("cannot setfilecon dir '%s': %s\n", pkgpath, strerror(errno)); return -1; } #endif |