Merge "Clear data deletes too much" into jb-mr1-dev

kruton · Android (Google) Code Review · commit e03c02447170 · 2012-10-22T16:11:45.000-07:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ int delete_user_data(const char *pkgname, uid_t persona)`
`185`	`185`	`if (create_pkg_path(pkgdir, pkgname, PKG_DIR_POSTFIX, persona))`
`186`	`186`	`return -1;`
`187`	`187`
`188`		`- /* delete contents AND directory, no exceptions */`
`189`		`- return delete_dir_contents(pkgdir, 1, NULL);`
	`188`	`+ /* delete contents, excluding "lib", but not the directory itself */`
	`189`	`+ return delete_dir_contents(pkgdir, 0, "lib");`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`int make_user_data(const char *pkgname, uid_t uid, uid_t persona)`