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

Commit 68128325 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to... 

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

* commit '443e4748':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
parents e3141345 443e4748

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

+2 −2
Original line number Diff line number Diff line
@@ -5036,7 +5036,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
            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 @@ public final class ActivityManagerService extends ActivityManagerNative













        } 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) {















            }















        }