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

Commit abb6aad8 authored by Ying Zheng's avatar Ying Zheng Committed by android-build-merger
Browse files

Merge "Fix a calling loop for getAllUsers." into pi-dev 

am: e02f32b9

Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f
parents 396330a5 e02f32b9

packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public final class UserManagerHelper { 
     * @return All users other than user with userId.

     */

    public List<UserInfo> getAllUsersExceptUser(int userId) {

        List<UserInfo> others = getAllUsers();

        List<UserInfo> others = mUserManager.getUsers(/* excludeDying= */true);



        for (Iterator<UserInfo> iterator = others.iterator(); iterator.hasNext(); ) {

            UserInfo userInfo = iterator.next();
@@ -183,7 +183,7 @@ public final class UserManagerHelper { 
        if (isHeadlessSystemUser()) {

            return getAllUsersExcludesSystemUser();

        }

        return mUserManager.getUsers(true /* excludeDying */);

        return mUserManager.getUsers(/* excludeDying= */true);

    }



    // User information accessors