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

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

Browse Source 
* commit 'cd42ce5d61d7854d1add5d4d308d1f3342baeea6':
  Fix crash when setting wallpaper from non-primary user.
This commit is contained in:
Dianne Hackborn
2012-09-07 16:17:09 -07:00
committed by Android Git Automerger
parent 7ff3058396 cd42ce5d61
commit ca02a46dab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ContentProviderRecord.java
View File

@@ -85,7 +85,7 @@ class ContentProviderRecord {
public boolean canRunHere(ProcessRecord app) { public boolean canRunHere(ProcessRecord app) {
return (info.multiprocess || info.processName.equals(app.processName)) 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) { public void addExternalProcessHandleLocked(IBinder token) {

2
services/java/com/android/server/pm/Settings.java
View File

@@ -1259,7 +1259,7 @@ final class Settings {
final ArrayList<PackageCleanItem> pkgs = mPackagesToBeCleaned.valueAt(i); final ArrayList<PackageCleanItem> pkgs = mPackagesToBeCleaned.valueAt(i);
for (int j=0; j<pkgs.size(); j++) { for (int j=0; j<pkgs.size(); j++) {
serializer.startTag(null, "cleaning-package"); 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_NAME, item.packageName);
serializer.attribute(null, ATTR_CODE, item.andCode ? "true" : "false"); serializer.attribute(null, ATTR_CODE, item.andCode ? "true" : "false");
serializer.attribute(null, ATTR_USER, userStr); serializer.attribute(null, ATTR_USER, userStr);