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

Commit e4e91c4e authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resolved conflicts for merge of e678897f to klp-dev-plus-aosp 

Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70
parents 754bad45 e678897f

cmds/installd/commands.c

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ int delete_user_data(const char *pkgname, userid_t userid) 
    return delete_dir_contents(pkgdir, 0, "lib");

}



int make_user_data(const char *pkgname, uid_t uid, userid_t userid)

int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo)

{

    char pkgdir[PKG_PATH_MAX];

    char applibdir[PKG_PATH_MAX];
@@ -245,7 +245,7 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid) 
        return -1;

    }



    if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {

    if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {

        ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libsymlink);

        unlink(pkgdir);

cmds/installd/installd.c

+3 −2
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static int do_rm_user_data(char **arg, char reply[REPLY_MAX]) 


static int do_mk_user_data(char **arg, char reply[REPLY_MAX])

{

    return make_user_data(arg[0], atoi(arg[1]), atoi(arg[2])); /* pkgname, uid, userid */

    return make_user_data(arg[0], atoi(arg[1]), atoi(arg[2]), arg[3]);

                             /* pkgname, uid, userid, seinfo */

}



static int do_rm_user(char **arg, char reply[REPLY_MAX])
@@ -142,7 +143,7 @@ struct cmdinfo cmds[] = { 
    { "rmuserdata",           2, do_rm_user_data },

    { "movefiles",            0, do_movefiles },

    { "linklib",              3, do_linklib },

    { "mkuserdata",           3, do_mk_user_data },

    { "mkuserdata",           4, do_mk_user_data },

    { "rmuser",               1, do_rm_user },

};

cmds/installd/installd.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ int uninstall(const char *pkgname, userid_t userid); 
int renamepkg(const char *oldpkgname, const char *newpkgname);

int fix_uid(const char *pkgname, uid_t uid, gid_t gid);

int delete_user_data(const char *pkgname, userid_t userid);

int make_user_data(const char *pkgname, uid_t uid, userid_t userid);

int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo);

int delete_user(userid_t userid);

int delete_cache(const char *pkgname, userid_t userid);

int move_dex(const char *src, const char *dst);