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

Commit 9034620d authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Allow content provider access across users" into lmp-dev

parents 20ceb903 ebf1fd99

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -8054,7 +8054,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                checkedGrants = true;

                checkedGrants = true;

            }

            }

            userId = handleIncomingUser(callingPid, callingUid, userId,

            userId = handleIncomingUser(callingPid, callingUid, userId,

                    false, ALLOW_NON_FULL_IN_PROFILE,

                    false, ALLOW_NON_FULL,

                    "checkContentProviderPermissionLocked " + cpi.authority, null);

                    "checkContentProviderPermissionLocked " + cpi.authority, null);

            if (userId != tmpTargetUserId) {

            if (userId != tmpTargetUserId) {

                // When we actually went to determine the final targer user ID, this ended

                // When we actually went to determine the final targer user ID, this ended