commit 11f0cb7d072cfd8c50d8111ebea1e78eb3c3d816
author Dianne Hackborn <hackbod@google.com> Sun Sep 16 17:12:34 2012 -0700
committer Dianne Hackborn <hackbod@google.com> Sun Sep 16 17:12:34 2012 -0700
tree 08e654b656e2613aaf0cdff2d343e60941cbea6a
parent b137c8065db941b23ab23f6550a1c65693039ff5

Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user

Change-Id: I0ab372978f8599d0fe8d5da8aeb73965ab85797f

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

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index b8072b3..989477f 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -5036,7 +5036,6 @@
             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 @@
         } 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) {
             }
         }