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

Fixed issue with MAX_RUNNING_USERS

Browse Source 
Previously the user being switched could remain running if primary user
had work profile, due to counter being decremented twice.

Test: manual switch with work profiles and without + cts
Bug: 67091825
Change-Id: I61212c6407fecefa0094c6265dee6f3184d95701
This commit is contained in:
Fyodor Kupolov
2017-10-25 14:23:43 -07:00
parent 0e0621a46b
commit bc77f8889e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/am/UserController.java
View File

@@ -250,21 +250,21 @@ class UserController implements Handler.Callback {
}
void stopRunningUsersLU(int maxRunningUsers) {
int num = mUserLru.size();
int currentlyRunning = mUserLru.size();
int i = 0;
while (num > maxRunningUsers && i < mUserLru.size()) {
while (currentlyRunning > maxRunningUsers && i < mUserLru.size()) {
Integer oldUserId = mUserLru.get(i);
UserState oldUss = mStartedUsers.get(oldUserId);
if (oldUss == null) {
// Shouldn't happen, but be sane if it does.
mUserLru.remove(i);
num--;
currentlyRunning--;
continue;
}
if (oldUss.state == UserState.STATE_STOPPING
|| oldUss.state == UserState.STATE_SHUTDOWN) {
// This user is already stopping, doesn't count.
num--;
currentlyRunning--;
i++;
continue;
}
@@ -272,16 +272,15 @@ class UserController implements Handler.Callback {
// Owner/System user and current user can't be stopped. We count it as running
// when it is not a pure system user.
if (UserInfo.isSystemOnly(oldUserId)) {
num--;
currentlyRunning--;
}
i++;
continue;
}
// This is a user to be stopped.
if (stopUsersLU(oldUserId, false, null) != USER_OP_SUCCESS) {
num--;
if (stopUsersLU(oldUserId, false, null) == USER_OP_SUCCESS) {
currentlyRunning--;
}
num--;
i++;
}
}