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

am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev

Browse Source 
* commit '5c6912c6f697e34d79447b0cd794a6d9edea72ab':
  Fix permission check on ContentProvider to be multi-user aware.
This commit is contained in:
Dianne Hackborn
2012-08-17 17:03:38 -07:00
committed by Android Git Automerger
parent ca5d8dc2c0 5c6912c6f6
commit e3d89013c6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,7 +279,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
final int uid = Binder.getCallingUid();
String missingPerm = null;
if (uid == mMyUid) {
if (UserHandle.isSameApp(uid, mMyUid)) {
return;
}
@@ -340,7 +340,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
final int uid = Binder.getCallingUid();
String missingPerm = null;
if (uid == mMyUid) {
if (UserHandle.isSameApp(uid, mMyUid)) {
return;
}