diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 379a0111b58c0..2200af679531b 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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