Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev

Dianne Hackborn · Android (Google) Code Review · commit 443e474881e2 · 2012-09-16T18:07:14.000-07:00
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -5036,7 +5036,6 @@ public int checkUriPermission(Uri uri, int pid, int uid, int modeFlags) {
             pid = tlsIdentity.pid;
         }
 
-        uid = UserHandle.getAppId(uid);
         // Our own process gets to do everything.
         if (pid == MY_PID) {
             return PackageManager.PERMISSION_GRANTED;
@@ -5088,7 +5087,8 @@ int checkGrantUriPermissionLocked(int callingUid, String targetPkg,
         } else {
             try {
                 pi = pm.resolveContentProvider(name,
-                        PackageManager.GET_URI_PERMISSION_PATTERNS, UserHandle.getUserId(callingUid));
+                        PackageManager.GET_URI_PERMISSION_PATTERNS,
+                        UserHandle.getUserId(callingUid));
             } catch (RemoteException ex) {
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -5036,7 +5036,6 @@ public int checkUriPermission(Uri uri, int pid, int uid, int modeFlags) {`
`5036`	`5036`	`pid = tlsIdentity.pid;`
`5037`	`5037`	`}`
`5038`	`5038`
`5039`		`- uid = UserHandle.getAppId(uid);`
`5040`	`5039`	`// Our own process gets to do everything.`
`5041`	`5040`	`if (pid == MY_PID) {`
`5042`	`5041`	`return PackageManager.PERMISSION_GRANTED;`
`@@ -5088,7 +5087,8 @@ int checkGrantUriPermissionLocked(int callingUid, String targetPkg,`
`5088`	`5087`	`} else {`
`5089`	`5088`	`try {`
`5090`	`5089`	`pi = pm.resolveContentProvider(name,`
`5091`		`- PackageManager.GET_URI_PERMISSION_PATTERNS, UserHandle.getUserId(callingUid));`
	`5090`	`+ PackageManager.GET_URI_PERMISSION_PATTERNS,`
	`5091`	`+ UserHandle.getUserId(callingUid));`
`5092`	`5092`	`} catch (RemoteException ex) {`
`5093`	`5093`	`}`
`5094`	`5094`	`}`