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

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

Merge "Fixing read from mUsersRedirectedToOwnerForMedia sparse array." into... 

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

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



Change-Id: I8aa2f04fb1e66184b7ad492150270f46570903fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4f6a21d 1bec369a

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