diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-04-14 23:45:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 23:45:13 +0000 |
| commit | d1500d8ff1ba70cd723076d94a994cdfcc1a64fb (patch) | |
| tree | d7f0454bc144f2c69415aae4773beec203ab509a | |
| parent | 3ba6474e3e09d269a17d6f3b1fea2251c38f5e7b (diff) | |
| parent | 1742cfbd8a1458e66f98a56f359590ce3263e161 (diff) | |
| download | frameworks_base-d1500d8ff1ba70cd723076d94a994cdfcc1a64fb.zip frameworks_base-d1500d8ff1ba70cd723076d94a994cdfcc1a64fb.tar.gz frameworks_base-d1500d8ff1ba70cd723076d94a994cdfcc1a64fb.tar.bz2 | |
Merge "Always set the dataDir for the given userId"
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 763a017..7464cab 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -4655,7 +4655,7 @@ public class PackageParser { private static boolean copyNeeded(int flags, Package p, PackageUserState state, Bundle metaData, int userId) { - if (userId != 0) { + if (userId != UserHandle.USER_OWNER) { // We always need to copy for other users, since we need // to fix up the uid. return true; @@ -4737,11 +4737,9 @@ public class PackageParser { // Make shallow copy so we can store the metadata/libraries safely ApplicationInfo ai = new ApplicationInfo(p.applicationInfo); - if (userId != 0) { - ai.uid = UserHandle.getUid(userId, ai.uid); - ai.dataDir = PackageManager.getDataDirForUser(ai.volumeUuid, ai.packageName, userId) - .getAbsolutePath(); - } + ai.uid = UserHandle.getUid(userId, ai.uid); + ai.dataDir = PackageManager.getDataDirForUser(ai.volumeUuid, ai.packageName, userId) + .getAbsolutePath(); if ((flags & PackageManager.GET_META_DATA) != 0) { ai.metaData = p.mAppMetaData; } @@ -4766,11 +4764,9 @@ public class PackageParser { // This is only used to return the ResolverActivity; we will just always // make a copy. ai = new ApplicationInfo(ai); - if (userId != 0) { - ai.uid = UserHandle.getUid(userId, ai.uid); - ai.dataDir = PackageManager.getDataDirForUser(ai.volumeUuid, ai.packageName, userId) - .getAbsolutePath(); - } + ai.uid = UserHandle.getUid(userId, ai.uid); + ai.dataDir = PackageManager.getDataDirForUser(ai.volumeUuid, ai.packageName, userId) + .getAbsolutePath(); if (state.stopped) { ai.flags |= ApplicationInfo.FLAG_STOPPED; } else { |