diff options
| author | Kenny Root <kroot@google.com> | 2012-10-22 16:17:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-22 16:17:17 -0700 |
| commit | 3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a (patch) | |
| tree | 608f70bf808eeefc94cc2aa69376002625d4e4c3 /cmds/installd | |
| parent | fdf263971b3bbc93d743195e840967063ccf5fcb (diff) | |
| parent | 55708a9dce5be627f68e388d4ad355595ad5fef5 (diff) | |
| download | frameworks_base-3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a.zip frameworks_base-3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a.tar.gz frameworks_base-3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a.tar.bz2 | |
am 55708a9d: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
* commit '55708a9dce5be627f68e388d4ad355595ad5fef5':
Clear data deletes too much
Diffstat (limited to 'cmds/installd')
| -rw-r--r-- | cmds/installd/commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 4d49c8a..59bcda1 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -187,8 +187,8 @@ int delete_user_data(const char *pkgname, uid_t persona) if (create_pkg_path(pkgdir, pkgname, PKG_DIR_POSTFIX, persona)) return -1; - /* delete contents AND directory, no exceptions */ - return delete_dir_contents(pkgdir, 1, NULL); + /* delete contents, excluding "lib", but not the directory itself */ + return delete_dir_contents(pkgdir, 0, "lib"); } int make_user_data(const char *pkgname, uid_t uid, uid_t persona) |