diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-08-31 12:12:28 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-08-31 15:33:21 -0700 |
| commit | 61f57379ca2c5b6290c8da7548fa17128f7ab24f (patch) | |
| tree | 1aadc5b172ecf5689455e03e5ab635b709d5021f /services/java/com/android/server/pm/Settings.java | |
| parent | 00453e7a0182b50cf01e65c97650b526284fe084 (diff) | |
| download | frameworks_base-61f57379ca2c5b6290c8da7548fa17128f7ab24f.zip frameworks_base-61f57379ca2c5b6290c8da7548fa17128f7ab24f.tar.gz frameworks_base-61f57379ca2c5b6290c8da7548fa17128f7ab24f.tar.bz2 | |
Centralize the creation of the user system directory
Environment.getUserSystemDirectory(int userId)
Use it all relevant places that was hardcoding it.
Also, wipe out the user's system directory when user is removed, otherwise old state
might be transferred to a new user.
Change-Id: I788ce9c4cf9624229e65efa7047bc0c019ccef0a
Diffstat (limited to 'services/java/com/android/server/pm/Settings.java')
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index 68b594a..5f10d44 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -745,13 +745,12 @@ final class Settings { } private File getUserPackagesStateFile(int userId) { - return new File(mSystemDir, - "users/" + userId + "/package-restrictions.xml"); + return new File(Environment.getUserSystemDirectory(userId), "package-restrictions.xml"); } private File getUserPackagesStateBackupFile(int userId) { - return new File(mSystemDir, - "users/" + userId + "/package-restrictions-backup.xml"); + return new File(Environment.getUserSystemDirectory(userId), + "package-restrictions-backup.xml"); } void writeAllUsersPackageRestrictionsLPr() { |