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

Commit 72864492 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: FixGetUserPropertyCache" into main

parents f5918fb5 24fb0fd7

core/java/android/content/ContentProvider.java

+1 −2
Original line number Diff line number Diff line
@@ -2781,8 +2781,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
            if (userId != UserHandle.USER_CURRENT

                    // getUserIdFromAuthority can return USER_NULL when can't cast the userId to

                    // an int, which can cause high volume of binder calls.

                    && (!android.multiuser.Flags.fixGetUserPropertyCache()

                        || userId != UserHandle.USER_NULL)

                    && userId != UserHandle.USER_NULL

                    && userId != mContext.getUserId()

                    // Since userId specified in content uri, the provider userId would be

                    // determined from it.

core/java/android/content/pm/multiuser.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -125,16 +125,6 @@ flag { 
  }

}



flag {

    name: "fix_get_user_property_cache"

    namespace: "multiuser"

    description: "Cache is not optimised for getUserProperty for values below 0, eg. UserHandler.USER_NULL or UserHandle.USER_ALL"

    bug: "350416200"

    metadata {

        purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "place_add_user_dialog_within_activity"

    namespace: "multiuser"

core/java/android/os/UserManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4027,7 +4027,7 @@ public class UserManager { 
            @CannotBeSpecialUser @NonNull UserHandle userHandle) {

        final int userId = userHandle.getIdentifier();



        if (userId < 0 && android.multiuser.Flags.fixGetUserPropertyCache()) {

        if (userId < 0) {

            // Avoid calling into system server for invalid user ids.

            throw new IllegalArgumentException("Cannot access properties for user " + userId);

        }