Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev

Christopher Tate · Android (Google) Code Review · commit a1c46636dd53 · 2012-09-19T13:01:32.000-07:00
diff --git a/core/java/android/content/ContentService.java b/core/java/android/content/ContentService.java
@@ -154,11 +154,15 @@ public void registerContentObserver(Uri uri, boolean notifyForDescendants,
             throw new IllegalArgumentException("You must pass a valid uri and observer");
         }
 
+        // STOPSHIP: disable the multi-user permission checks until a solid fix for the
+        // content provider / observer case is in place.
+        /*
         final int callingUser = UserHandle.getCallingUserId();
         if (callingUser != userHandle) {
             mContext.enforceCallingOrSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,
                     "no permission to observe other users' provider view");
         }
+        */
 
         if (userHandle < 0) {
             if (userHandle == UserHandle.USER_CURRENT) {

Original file line number	Diff line number	Diff line change
`@@ -154,11 +154,15 @@ public void registerContentObserver(Uri uri, boolean notifyForDescendants,`
`154`	`154`	`throw new IllegalArgumentException("You must pass a valid uri and observer");`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ // STOPSHIP: disable the multi-user permission checks until a solid fix for the`
	`158`	`+ // content provider / observer case is in place.`
	`159`	`+ /*`
`157`	`160`	`final int callingUser = UserHandle.getCallingUserId();`
`158`	`161`	`if (callingUser != userHandle) {`
`159`	`162`	`mContext.enforceCallingOrSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,`
`160`	`163`	`"no permission to observe other users' provider view");`
`161`	`164`	`}`
	`165`	`+ */`
`162`	`166`
`163`	`167`	`if (userHandle < 0) {`
`164`	`168`	`if (userHandle == UserHandle.USER_CURRENT) {`