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

Commit 6f3354c9 authored by Anna Bauza's avatar Anna Bauza
Browse files

Flag removal: CacheUserInfoReadOnly 

Bug: 416491907
Flag: EXEMPT removing android.multiuser.cache_user_info_read_only
Test: N/A
Change-Id: I6603db96d2c93bb4a53ffa46e0a0fe9de3a6ecc0
parent 7d889283

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

+0 −11
Original line number Diff line number Diff line
@@ -182,17 +182,6 @@ flag { 
  is_fixed_read_only: true

}



flag {

    name: "cache_user_info_read_only"

    namespace: "multiuser"

    description: "Cache UserInfo to avoid unnecessary binder calls"

    bug: "161915546"

    metadata {

        purpose: PURPOSE_BUGFIX

  }

  is_fixed_read_only: true

}



flag {

    name: "cache_user_start_realtime_read_only"

    namespace: "multiuser"

core/java/android/os/UserManager.java

+5 −14
Original line number Diff line number Diff line
@@ -4001,15 +4001,8 @@ public class UserManager { 
            Manifest.permission.QUERY_USERS})

    @CachedProperty(api = "user_manager_user_data")

    public UserInfo getUserInfo(@UserIdInt int userId) {

        if (android.multiuser.Flags.cacheUserInfoReadOnly()) {

        return UserManagerCache.getUserInfo(mService::getUserInfo, userId);

    }

        try {

            return mService.getUserInfo(userId);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * Returns a {@link UserProperties} object describing the properties of the given user.
@@ -6627,13 +6620,11 @@ public class UserManager { 
     * @hide

     */

    public static final void invalidateCacheOnUserDataChanged() {

        if (android.multiuser.Flags.cacheUserInfoReadOnly()) {

        // TODO(b/383175685): Rename the invalidation call to make it clearer that it

        // invalidates the caches for both getProfiles and getUserInfo (since they both use the

        // same user_manager_user_data CachedProperty.api).

         UserManagerCache.invalidateProfiles();

    }

    }



    /**

     * Returns a serial number on this device for a given userId. User handles can be recycled

services/tests/servicestests/src/com/android/server/pm/UserManagerCacheTest.java

+0 −6
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public final class UserManagerCacheTest { 


    @MediumTest

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHE_USER_INFO_READ_ONLY)

    public void testUserInfoAfterLocaleChange() throws Exception {

        UserInfo userInfo = mUserManager.createGuest(mContext);

        mUsersToRemove.add(userInfo.id);
@@ -144,7 +143,6 @@ public final class UserManagerCacheTest { 


    @MediumTest

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHE_USER_INFO_READ_ONLY)

    public void testGetUserInfo10kSpam() throws Exception {

        UserInfo cachedUserInfo = mUserManager.getUserInfo(mOriginalCurrentUserId);

        for (int i = 0; i < 10000; i++) {
@@ -160,7 +158,6 @@ public final class UserManagerCacheTest { 


    @MediumTest

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHE_USER_INFO_READ_ONLY)

    public void testSetUserAdmin() throws Exception {

        UserInfo userInfo = mUserManager.createUser("SecondaryUser",

                UserManager.USER_TYPE_FULL_SECONDARY, /*flags=*/ 0);
@@ -182,7 +179,6 @@ public final class UserManagerCacheTest { 


    @MediumTest

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHE_USER_INFO_READ_ONLY)

    public void testRevokeUserAdmin() throws Exception {

        UserInfo userInfo = mUserManager.createUser("Admin",

                UserManager.USER_TYPE_FULL_SECONDARY, /*flags=*/ UserInfo.FLAG_ADMIN);
@@ -202,7 +198,6 @@ public final class UserManagerCacheTest { 


    @MediumTest

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHE_USER_INFO_READ_ONLY)

    public void testRevokeUserAdminFromNonAdmin() throws Exception {

        UserInfo userInfo = mUserManager.createUser("NonAdmin",

                UserManager.USER_TYPE_FULL_SECONDARY, /*flags=*/ 0);
@@ -223,7 +218,6 @@ public final class UserManagerCacheTest { 


    @MediumTest

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHE_USER_INFO_READ_ONLY)

    public void testSetUserName_withContextUserId() throws Exception {

        assumeManagedUsersSupported();

        final String newName = "Managed_user 1";