Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ying Zheng
2018-06-05 22:58:31 +00:00
committed by Android (Google) Code Review
parent 22385d9d4e 9b3422a5e1
commit e02f32b921
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
View File

@@ -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