PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude dying users when querying the list

Browse Source 
Bug: 7194894

Use the new API in UserManager to query the list of users, excluding
the dying ones.

Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
This commit is contained in:
Amith Yamasani
2012-09-20 22:44:48 -07:00
parent 9e143f5e9d
commit e278eda851
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/UserSettings.java
View File

@@ -184,7 +184,7 @@ public class UserSettings extends SettingsPreferenceFragment
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (UserHandle.myUserId() == UserHandle.USER_OWNER) { if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
if (mUserManager.getMaxSupportedUsers() > mUserManager.getUsers().size()) { if (mUserManager.getMaxSupportedUsers() > mUserManager.getUsers(false).size()) {
MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu); MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
| MenuItem.SHOW_AS_ACTION_WITH_TEXT); | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
@@ -373,7 +373,7 @@ public class UserSettings extends SettingsPreferenceFragment
private void updateUserList() { private void updateUserList() {
if (getActivity() == null) return; if (getActivity() == null) return;
List<UserInfo> users = mUserManager.getUsers(); List<UserInfo> users = mUserManager.getUsers(true);
mUserListCategory.removeAll(); mUserListCategory.removeAll();
mUserListCategory.setOrderingAsAdded(false); mUserListCategory.setOrderingAsAdded(false);