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

am: e02f32b921

Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f

1 files 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 3eb79130de63..4c45a75d876a 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