Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev

Author: jsharkey

services/java/com/android/server/pm/PackageManagerService.java

@@ -1835,7 +1835,8 @@ public ApplicationInfo getApplicationInfo(String packageName, int flags, int use
                 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;