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

am f6c8169a: am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104

Browse Source 
* commit 'f6c8169a684183d5149fc7d41b92adbb1700dab5':
  Fix singleUser provider grants
This commit is contained in:
Amith Yamasani
2014-11-07 03:55:33 +00:00
committed by Android Git Automerger
parent 0fecad76d1 f6c8169a68
commit c179e4adc8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/ContentProvider.java
View File

@@ -515,7 +515,10 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
}
// last chance, check against any uri grants
if (context.checkUriPermission(uri, pid, uid, Intent.FLAG_GRANT_READ_URI_PERMISSION)
final int callingUserId = UserHandle.getUserId(uid);
final Uri userUri = (mSingleUser && !UserHandle.isSameUser(mMyUid, uid))
? maybeAddUserId(uri, callingUserId) : uri;
if (context.checkUriPermission(userUri, pid, uid, Intent.FLAG_GRANT_READ_URI_PERMISSION)
== PERMISSION_GRANTED) {
return;
}