Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib22c9f7e452997d66fe84eecd6502e0dfca7ba0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Himanshu Gupta
2023-05-12 22:09:51 +00:00
committed by Automerger Merge Worker
parent b817e50713 aeace823f7
commit 1bec369a32
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/ContentProvider.java
View File

@@ -892,8 +892,9 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
*/ */
private boolean isContentRedirectionAllowedForUser(int incomingUserId) { private boolean isContentRedirectionAllowedForUser(int incomingUserId) {
if (MediaStore.AUTHORITY.equals(mAuthority)) { if (MediaStore.AUTHORITY.equals(mAuthority)) {
if (mUsersRedirectedToOwnerForMedia.indexOfKey(incomingUserId) >= 0) { int incomingUserIdIndex = mUsersRedirectedToOwnerForMedia.indexOfKey(incomingUserId);
return mUsersRedirectedToOwnerForMedia.valueAt(incomingUserId); if (incomingUserIdIndex >= 0) {
return mUsersRedirectedToOwnerForMedia.valueAt(incomingUserIdIndex);
} }
// Haven't seen this user yet, look it up // Haven't seen this user yet, look it up