ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Make clear data stricter." into lmp-dev

Browse Source
This commit is contained in:
Jeff Sharkey 2014-08-27 17:58:34 +00:00 committed by Android (Google) Code Review
commit 7903c6a263
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/installd/commands.c
View File

@ -177,10 +177,6 @@ int fix_uid(const char *pkgname, uid_t uid, gid_t gid)
return 0; return 0;
} }
static int lib_dir_matcher(const char* file_name, const int is_dir) {
return is_dir && !strcmp(file_name, "lib");
}
int delete_user_data(const char *pkgname, userid_t userid) int delete_user_data(const char *pkgname, userid_t userid)
{ {
char pkgdir[PKG_PATH_MAX]; char pkgdir[PKG_PATH_MAX];
@ -188,8 +184,7 @@ int delete_user_data(const char *pkgname, userid_t userid)
if (create_pkg_path(pkgdir, pkgname, PKG_DIR_POSTFIX, userid)) if (create_pkg_path(pkgdir, pkgname, PKG_DIR_POSTFIX, userid))
return -1; return -1;
/* delete contents, excluding "lib", but not the directory itself */ return delete_dir_contents(pkgdir, 0, NULL);
return delete_dir_contents(pkgdir, 0, &lib_dir_matcher);
} }
int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo) int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo)