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

Merge "Update to use UserManager.getUserSwitchability()"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-31 18:40:34 +00:00
committed by Android (Google) Code Review
parent bf7e4efa60 4886465390
commit c7f686a066
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
View File

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.car;
import static android.content.DialogInterface.BUTTON_NEGATIVE;
import static android.content.DialogInterface.BUTTON_POSITIVE;
import static android.os.UserManager.DISALLOW_ADD_USER;
import static android.os.UserManager.SWITCHABILITY_STATUS_OK;
import android.app.ActivityManager;
import android.app.AlertDialog;
@@ -123,10 +124,12 @@ public class UserGridRecyclerView extends RecyclerView {
}
private List<UserRecord> createUserRecords(List<UserInfo> userInfoList) {
int fgUserId = ActivityManager.getCurrentUser();
UserHandle fgUserHandle = UserHandle.of(fgUserId);
List<UserRecord> userRecords = new ArrayList<>();
// If the foreground user CANNOT switch to other users, only display the foreground user.
if (!mCarUserManagerHelper.canForegroundUserSwitchUsers()) {
if (mUserManager.getUserSwitchability(fgUserHandle) != SWITCHABILITY_STATUS_OK) {
userRecords.add(createForegroundUserRecord());
return userRecords;
}
@@ -137,7 +140,7 @@ public class UserGridRecyclerView extends RecyclerView {
continue;
}
boolean isForeground = ActivityManager.getCurrentUser() == userInfo.id;
boolean isForeground = fgUserId == userInfo.id;
UserRecord record = new UserRecord(userInfo, false /* isStartGuestSession */,
false /* isAddUser */, isForeground);
userRecords.add(record);
@@ -147,7 +150,6 @@ public class UserGridRecyclerView extends RecyclerView {
userRecords.add(createStartGuestUserRecord());
// Add add user record if the foreground user can add users
UserHandle fgUserHandle = UserHandle.of(ActivityManager.getCurrentUser());
if (!mUserManager.hasUserRestriction(DISALLOW_ADD_USER, fgUserHandle)) {
userRecords.add(createAddUserRecord());
}