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

Commit 54118289 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Use public method in RestrictedLockUtils#isCurrentUserOrProfile"

parents 3e0f1b46 54ff6b01

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -4130,7 +4130,6 @@ package android.os { 




  public class UserManager {

  public class UserManager {

    method public void clearSeedAccountData();

    method public void clearSeedAccountData();

    method public int[] getProfileIds(int, boolean);

    method public java.lang.String getSeedAccountName();

    method public java.lang.String getSeedAccountName();

    method public android.os.PersistableBundle getSeedAccountOptions();

    method public android.os.PersistableBundle getSeedAccountOptions();

    method public java.lang.String getSeedAccountType();

    method public java.lang.String getSeedAccountType();

core/java/android/os/UserManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -2363,7 +2363,6 @@ public class UserManager { 
     */

     */

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

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

            Manifest.permission.CREATE_USERS}, conditional = true)

            Manifest.permission.CREATE_USERS}, conditional = true)

    @SystemApi

    public @NonNull int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) {

    public @NonNull int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) {

        try {

        try {

            return mService.getProfileIds(userId, enabledOnly);

            return mService.getProfileIds(userId, enabledOnly);

packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java

+1 −7
Original line number Original line Diff line number Diff line
@@ -91,13 +91,7 @@ public class RestrictedLockUtils { 




    public static boolean isCurrentUserOrProfile(Context context, int userId) {

    public static boolean isCurrentUserOrProfile(Context context, int userId) {

        UserManager um = context.getSystemService(UserManager.class);

        UserManager um = context.getSystemService(UserManager.class);

        int[] userIds = um.getProfileIds(UserHandle.myUserId(), true);

        return um.getUserProfiles().contains(UserHandle.of(userId));

        for (int i = 0; i < userIds.length; i++) {

            if (userIds[i] == userId) {

                return true;

            }

        }

        return false;

    }

    }





    public static class EnforcedAdmin {

    public static class EnforcedAdmin {