diff options
| author | Kenny Root <kroot@google.com> | 2011-07-25 12:32:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-25 12:32:10 -0700 |
| commit | b243d5bc7db88396f0da304553687e7a0bccfa3d (patch) | |
| tree | e99ab769a849ff1515c4bc6d4e1328da0aa0adac | |
| parent | 5ccdaa9a0354f0424303ef4f94a65e35764cc9c4 (diff) | |
| parent | 9c8625ead8acd695909d14e3cbda659622848873 (diff) | |
| download | frameworks_base-b243d5bc7db88396f0da304553687e7a0bccfa3d.zip frameworks_base-b243d5bc7db88396f0da304553687e7a0bccfa3d.tar.gz frameworks_base-b243d5bc7db88396f0da304553687e7a0bccfa3d.tar.bz2 | |
Merge "Change user 0 directory back for compatibility"
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index d6a15e6..9eb1179 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -2860,8 +2860,17 @@ public class PackageManagerService extends IPackageManager.Stub { } private File getDataPathForPackage(String packageName, int userId) { - return new File(mUserAppDataDir.getAbsolutePath() + File.separator + userId + /* + * Until we fully support multiple users, return the directory we + * previously would have. The PackageManagerTests will need to be + * revised when this is changed back.. + */ + if (userId == 0) { + return new File(mAppDataDir, packageName); + } else { + return new File(mUserAppDataDir.getAbsolutePath() + File.separator + userId + File.separator + packageName); + } } private PackageParser.Package scanPackageLI(PackageParser.Package pkg, |