From a2d838a542c34d2887a0ec1fafa5f47566d595e9 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 9 Jan 2013 16:00:35 -0800 Subject: Revert "App home directories are now 0700 for targetSdkVersion > 17" This reverts commit 7f5c84a0b25706746a92ad1233cbbb8923eda54d. Bug: 7966399 Bug: 7208882 Change-Id: I9fb13cf06c0f6605f3d992525346b14fe3259c66 --- cmds/installd/installd.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'cmds/installd/installd.c') diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c index bf21102..2285e79 100644 --- a/cmds/installd/installd.c +++ b/cmds/installd/installd.c @@ -31,11 +31,7 @@ static int do_ping(char **arg, char reply[REPLY_MAX]) static int do_install(char **arg, char reply[REPLY_MAX]) { - bool restrictHomeDir = (strncmp(arg[3], "false", 6) != 0); - return install(arg[0], /* pkgname */ - atoi(arg[1]), /* uid */ - atoi(arg[2]), /* gid */ - restrictHomeDir); /* restrictHomeDir */ + return install(arg[0], atoi(arg[1]), atoi(arg[2])); /* pkgname, uid, gid */ } static int do_dexopt(char **arg, char reply[REPLY_MAX]) @@ -107,11 +103,7 @@ static int do_rm_user_data(char **arg, char reply[REPLY_MAX]) static int do_mk_user_data(char **arg, char reply[REPLY_MAX]) { - bool restrictHomeDir = (strncmp(arg[3], "false", 6) != 0); - return make_user_data(arg[0], /* pkgname */ - atoi(arg[1]), /* uid */ - atoi(arg[2]), /* userid */ - restrictHomeDir); /* restrictHomeDir */ + return make_user_data(arg[0], atoi(arg[1]), atoi(arg[2])); /* pkgname, uid, userid */ } static int do_rm_user(char **arg, char reply[REPLY_MAX]) @@ -137,7 +129,7 @@ struct cmdinfo { struct cmdinfo cmds[] = { { "ping", 0, do_ping }, - { "install", 4, do_install }, + { "install", 3, do_install }, { "dexopt", 3, do_dexopt }, { "movedex", 2, do_move_dex }, { "rmdex", 1, do_rm_dex }, @@ -150,7 +142,7 @@ struct cmdinfo cmds[] = { { "rmuserdata", 2, do_rm_user_data }, { "movefiles", 0, do_movefiles }, { "linklib", 3, do_linklib }, - { "mkuserdata", 4, do_mk_user_data }, + { "mkuserdata", 3, do_mk_user_data }, { "rmuser", 1, do_rm_user }, }; -- cgit v1.1