Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d295bda authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 43b69c75: am a1c46636: Merge "Disable content observer cross-user... 

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

* commit '43b69c75':
  Disable content observer cross-user permission checks...
parents 1a30458a 43b69c75

core/java/android/content/ContentService.java

+4 −0
Original line number Diff line number Diff line
@@ -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) {