Fix permission check on ContentProvider to be multi-user aware.

Dianne Hackborn · Dianne Hackborn · commit 0d8af78b748d · 2012-08-17T16:51:54.000-07:00
Change-Id: I1e504fe6561caef99d478e37660e2294fec7ea8b
diff --git a/core/java/android/content/ContentProvider.java b/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;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private void enforceReadPermission(Uri uri) throws SecurityException {`
`279`	`279`	`final int uid = Binder.getCallingUid();`
`280`	`280`	`String missingPerm = null;`
`281`	`281`
`282`		`- if (uid == mMyUid) {`
	`282`	`+ if (UserHandle.isSameApp(uid, mMyUid)) {`
`283`	`283`	`return;`
`284`	`284`	`}`
`285`	`285`
`@@ -340,7 +340,7 @@ private void enforceWritePermission(Uri uri) throws SecurityException {`
`340`	`340`	`final int uid = Binder.getCallingUid();`
`341`	`341`	`String missingPerm = null;`
`342`	`342`
`343`		`- if (uid == mMyUid) {`
	`343`	`+ if (UserHandle.isSameApp(uid, mMyUid)) {`
`344`	`344`	`return;`
`345`	`345`	`}`
`346`	`346`