diff options
| author | Kenny Root <kroot@google.com> | 2012-10-22 16:14:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-22 16:14:14 -0700 |
| commit | 55708a9dce5be627f68e388d4ad355595ad5fef5 (patch) | |
| tree | f6ececb0f045f05f926f8f7af274cf6de4627d2b /cmds | |
| parent | 9defd0663e2b6a486f5bc72621bbbd4dfab666fb (diff) | |
| parent | e03c0244717093e0fbc9b05073d3ae3dbd8fcea5 (diff) | |
| download | frameworks_base-55708a9dce5be627f68e388d4ad355595ad5fef5.zip frameworks_base-55708a9dce5be627f68e388d4ad355595ad5fef5.tar.gz frameworks_base-55708a9dce5be627f68e388d4ad355595ad5fef5.tar.bz2 | |
am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
* commit 'e03c0244717093e0fbc9b05073d3ae3dbd8fcea5':
Clear data deletes too much
Diffstat (limited to 'cmds')
| -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 8e4d7ed..387f33d 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -185,8 +185,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) |