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

* commit 'a1c46636dd533e889e1f3b3326fa0d851928df4f':
  Disable content observer cross-user permission checks...

core/java/android/content/ContentService.java

@@ -154,11 +154,15 @@ public final class ContentService extends IContentService.Stub {
             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) {