Merge "Clean up usages of findCurrentGuestUser" (0fa4a143) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -2441,9 +2441,9 @@ public class UserManagerService extends IUserManager.Stub {
		mGuestRestrictions.clear();
		mGuestRestrictions.putAll(restrictions);
		final List<UserInfo> guests = getGuestUsers();
		for (UserInfo guest : guests) {
		for (int i = 0; i < guests.size(); i++) {
		synchronized (mRestrictionsLock) {
		updateUserRestrictionsInternalLR(mGuestRestrictions, guest.id);
		updateUserRestrictionsInternalLR(mGuestRestrictions, guests.get(i).id);
		}
		}
		}
		@@ -3688,7 +3688,8 @@ public class UserManagerService extends IUserManager.Stub {
		}
		// DISALLOW_CONFIG_WIFI was made a default guest restriction some time during version 6.
		final List<UserInfo> guestUsers = getGuestUsers();
		for (UserInfo guestUser : guestUsers) {
		for (int i = 0; i < guestUsers.size(); i++) {
		final UserInfo guestUser = guestUsers.get(i);
		if (guestUser != null && !hasUserRestriction(
		UserManager.DISALLOW_CONFIG_WIFI, guestUser.id)) {
		setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, guestUser.id);

+3 −2

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import java.util.List;
		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.TimeUnit;

		@@ -108,8 +109,8 @@ public class UserLifecycleStressTest {
		switchUser(USER_SYSTEM);
		}

		final UserInfo foundGuest = mUserManager.findCurrentGuestUser();
		int nextGuestId = foundGuest == null ? USER_NULL : foundGuest.id;
		final List<UserInfo> guestUsers = mUserManager.getGuestUsers();
		int nextGuestId = guestUsers.isEmpty() ? USER_NULL : guestUsers.get(0).id;

		for (int i = 0; i < NUM_ITERATIONS; i++) {
		final int currentGuestId = nextGuestId;