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

This commit is contained in:
Dianne Hackborn
2012-08-17 17:01:47 -07:00
committed by Android (Google) Code Review

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;
}