diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-08-27 18:26:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-27 18:26:20 +0000 |
| commit | 18a9457edde6163539338e05a31c3431bc747c5f (patch) | |
| tree | 9b74f5c37e506d02207bdb551b3e37c6a2f6d03b /cmds | |
| parent | 7330016a75085631064daab303e1efe583f75125 (diff) | |
| parent | 7903c6a263354506ace10fc32aa65c231b64f62b (diff) | |
| download | frameworks_native-18a9457edde6163539338e05a31c3431bc747c5f.zip frameworks_native-18a9457edde6163539338e05a31c3431bc747c5f.tar.gz frameworks_native-18a9457edde6163539338e05a31c3431bc747c5f.tar.bz2 | |
am 7903c6a2: Merge "Make clear data stricter." into lmp-dev
* commit '7903c6a263354506ace10fc32aa65c231b64f62b':
Make clear data stricter.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 2304301..0f62aeb 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -177,10 +177,6 @@ int fix_uid(const char *pkgname, uid_t uid, gid_t gid) 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) { 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)) return -1; - /* delete contents, excluding "lib", but not the directory itself */ - return delete_dir_contents(pkgdir, 0, &lib_dir_matcher); + return delete_dir_contents(pkgdir, 0, NULL); } int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* seinfo) |