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

Author: Dianne Hackborn

core/java/android/content/ContentProvider.java

@@ -279,7 +279,7 @@ private void enforceReadPermission(Uri uri) throws SecurityException {
             final int uid = Binder.getCallingUid();
             String missingPerm = null;
 
-            if (uid == mMyUid) {
+            if (UserHandle.isSameApp(uid, mMyUid)) {
                 return;
             }
 
@@ -340,7 +340,7 @@ private void enforceWritePermission(Uri uri) throws SecurityException {
             final int uid = Binder.getCallingUid();
             String missingPerm = null;
 
-            if (uid == mMyUid) {
+            if (UserHandle.isSameApp(uid, mMyUid)) {
                 return;
             }