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

Commit b879342f authored by Anna Bauza's avatar Anna Bauza Committed by Android (Google) Code Review
Browse files

Merge "make isUserUnlocked and isUserUnlockingOrUnlocked caches static to... 

Merge "make isUserUnlocked and isUserUnlockingOrUnlocked caches static to decrease number of instances held by GMS process" into main
parents 4a47e477 de699944

core/java/android/os/UserManager.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -3796,9 +3796,9 @@ public class UserManager { 
    @UnsupportedAppUsage

    @UnsupportedAppUsage

    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,

    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,

            Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)

            Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)

    @CachedProperty(modsFlagOnOrNone = {}, api = "is_user_unlocked")

    @CachedProperty(api = "is_user_unlocked")

    public boolean isUserUnlocked(@UserIdInt int userId) {

    public boolean isUserUnlocked(@UserIdInt int userId) {

        return ((UserManagerCache) mIpcDataCache).isUserUnlocked(mService::isUserUnlocked, userId);

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

    }

    }





    /** @hide */

    /** @hide */
@@ -3834,9 +3834,9 @@ public class UserManager { 
    /** @hide */

    /** @hide */

    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,

    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,

            Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)

            Manifest.permission.INTERACT_ACROSS_USERS}, conditional = true)

    @CachedProperty(modsFlagOnOrNone = {}, api = "is_user_unlocked")

    @CachedProperty(api = "is_user_unlocked")

    public boolean isUserUnlockingOrUnlocked(@UserIdInt int userId) {

    public boolean isUserUnlockingOrUnlocked(@UserIdInt int userId) {

        return ((UserManagerCache) mIpcDataCache)

        return UserManagerCache

                .isUserUnlockingOrUnlocked(mService::isUserUnlockingOrUnlocked, userId);

                .isUserUnlockingOrUnlocked(mService::isUserUnlockingOrUnlocked, userId);

    }

    }