Merge "Fixed issue with MAX_RUNNING_USERS" (eeb73108) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/UserController.java

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -250,21 +250,21 @@ class UserController implements Handler.Callback {
	}		}

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