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

Merge "Fix singleUser provider grants" into lmp-mr1-dev

Browse Source 
automerge: 775d104

* commit '775d104db29dc8bdd8922fd7627cf646869d90c8':
  Fix singleUser provider grants
This commit is contained in:
Amith Yamasani
2014-11-06 21:37:06 +00:00
committed by android-build-merger
parent 39f6be1216 775d104db2
commit 26d8d1d5cb
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 // 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) { == PERMISSION_GRANTED) {
return; return;
} }