diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-16 18:07:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 18:07:14 -0700 |
| commit | 443e474881e2b8d2fce0d23c54f8930742d8cdee (patch) | |
| tree | 9c9bc55dd673715b9516ee5d66fe1317e7898027 /services/java/com/android/server | |
| parent | db831da426602f36e4ccf2eae64e999fcc52736a (diff) | |
| parent | 11f0cb7d072cfd8c50d8111ebea1e78eb3c3d816 (diff) | |
| download | frameworks_base-443e474881e2b8d2fce0d23c54f8930742d8cdee.zip frameworks_base-443e474881e2b8d2fce0d23c54f8930742d8cdee.tar.gz frameworks_base-443e474881e2b8d2fce0d23c54f8930742d8cdee.tar.bz2 | |
Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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) { } } |