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

Commit cebdb613 authored by Himanshu Gupta's avatar Himanshu Gupta Committed by Automerger Merge Worker
Browse files

Merge "Fixing read from mUsersRedirectedToOwnerForMedia sparse array." into udc-dev am: aeace823 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214017



Change-Id: Ie8fb78e4a3cc95ea8a10d5cfad342d6089689b29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 342c0af6 aeace823

core/java/android/content/ContentProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -892,8 +892,9 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
     */

    private boolean isContentRedirectionAllowedForUser(int incomingUserId) {

        if (MediaStore.AUTHORITY.equals(mAuthority)) {

            if (mUsersRedirectedToOwnerForMedia.indexOfKey(incomingUserId) >= 0) {

                return mUsersRedirectedToOwnerForMedia.valueAt(incomingUserId);

            int incomingUserIdIndex = mUsersRedirectedToOwnerForMedia.indexOfKey(incomingUserId);

            if (incomingUserIdIndex >= 0) {

                return mUsersRedirectedToOwnerForMedia.valueAt(incomingUserIdIndex);

            }



            // Haven't seen this user yet, look it up