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

Commit a1c46636 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

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

parents 390392ff e6c660ab

core/java/android/content/ContentService.java

+4 −0
Original line number Original line 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");

            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();

        final int callingUser = UserHandle.getCallingUserId();

        if (callingUser != userHandle) {

        if (callingUser != userHandle) {

            mContext.enforceCallingOrSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,

            mContext.enforceCallingOrSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL,

                    "no permission to observe other users' provider view");

                    "no permission to observe other users' provider view");

        }

        }

        */





        if (userHandle < 0) {

        if (userHandle < 0) {

            if (userHandle == UserHandle.USER_CURRENT) {

            if (userHandle == UserHandle.USER_CURRENT) {