Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 165c8bdf authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 0e4d2885: am 2044ac43: Merge "Convert all selinux_android_restorecon and... 

am 0e4d2885: am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '0e4d2885':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
parents 87c01eda 0e4d2885

cmds/dumpstate/utils.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ const char *dump_traces() { 
        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

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) 
        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 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* 
        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

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int initialize_directories() { 
            goto fail;

        }



        if (selinux_android_restorecon(android_media_dir.path)) {

        if (selinux_android_restorecon(android_media_dir.path, 0)) {

            goto fail;

        }