Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev

Author: Dianne Hackborn

services/java/com/android/server/am/ContentProviderRecord.java

@@ -85,7 +85,7 @@ public ContentProviderHolder newHolder(ContentProviderConnection conn) {
 
     public boolean canRunHere(ProcessRecord app) {
         return (info.multiprocess || info.processName.equals(app.processName))
-                && (uid == Process.SYSTEM_UID || uid == app.info.uid);
+                && uid == app.info.uid;
     }
 
     public void addExternalProcessHandleLocked(IBinder token) {

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

@@ -1259,7 +1259,7 @@ void writeLPr() {
                     final ArrayList<PackageCleanItem> pkgs = mPackagesToBeCleaned.valueAt(i);
                     for (int j=0; j<pkgs.size(); j++) {
                         serializer.startTag(null, "cleaning-package");
-                        PackageCleanItem item = pkgs.get(i);
+                        PackageCleanItem item = pkgs.get(j);
                         serializer.attribute(null, ATTR_NAME, item.packageName);
                         serializer.attribute(null, ATTR_CODE, item.andCode ? "true" : "false");
                         serializer.attribute(null, ATTR_USER, userStr);