Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev

Browse Source 
* commit '49db71e962b8ae17a3698534c800ea7511060dac':
  Return ApplicationInfo with requested userId.
This commit is contained in:
Jeff Sharkey
2012-10-11 17:28:57 -07:00
committed by Android Git Automerger
parent 82c1b13e8a 49db71e962
commit 250a90cacf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1835,7 +1835,8 @@ public class PackageManagerService extends IPackageManager.Stub {
PackageSetting ps = mSettings.mPackages.get(packageName);
if (ps == null) return null;
// Note: isEnabledLP() does not apply here - always return info
return PackageParser.generateApplicationInfo(p, flags, ps.readUserState(userId));
return PackageParser.generateApplicationInfo(
p, flags, ps.readUserState(userId), userId);
}
if ("android".equals(packageName)||"system".equals(packageName)) {
return mAndroidApplication;