From 9b3422a5e16256d41ab8b5b9354080cd924090af Mon Sep 17 00:00:00 2001
From: Ying Zheng <yizheng@google.com>
Date: Tue, 5 Jun 2018 11:47:40 -0700
Subject: [PATCH] Fix a calling loop for getAllUsers.

Bug: 109698349
Test: Manual
Change-Id: Id5def3c876ccfb390dd91f7cb24ebd43ebdeaef0
---
 .../src/com/android/settingslib/users/UserManagerHelper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java b/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
index 3eb79130de63a..4c45a75d876a2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
@@ -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