Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd42ce5d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents df4a94e2 11941fd6

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ class ContentProviderRecord { 


    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

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ final class Settings { 
                    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);