Merge "Fixed DPM.logoutUser() methods." (484e4efc) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -10133,7 +10133,9 @@ public class DevicePolicyManager {

		/**
		* Called by a profile owner of secondary user that is affiliated with the device to stop the
		* calling user and switch back to primary user.
		* calling user and switch back to primary user (when the user was
		* {@link #switchUser(ComponentName, UserHandle)} switched to) or stop the user (when it was
		* {@link #startUserInBackground(ComponentName, UserHandle) started in background}.
		*
		* <p>Notice that on devices running with
		* {@link UserManager#isHeadlessSystemUserMode() headless system user mode}, there is no primary
		@@ -10161,7 +10163,12 @@ public class DevicePolicyManager {
		}

		/**
		* Same as {@link #logoutUser(ComponentName)}, but called by system (like Settings), not admin.
		* Similar to {@link #logoutUser(ComponentName)}, except:
		*
		* <ul>
		* <li>Called by system (like Settings), not admin.
		* <li>It logs out the current user, not the caller.
		* </ul>
		*
		* @hide
		*/
		@@ -10178,7 +10185,10 @@ public class DevicePolicyManager {
		}
		/**
		* Gets the user a {@link #logoutUser(ComponentName)} call would switch to,
		* or {@code null} if the current user is not in a session.
		* or {@code null} if the current user is not in a session (i.e., if it was not
		* {@link #switchUser(ComponentName, UserHandle) switched} or
		* {@link #startUserInBackground(ComponentName, UserHandle) started in background} by the
		* device admin.
		*
		* @hide
		*/

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -11083,6 +11083,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		switched = mInjector.getIActivityManager().switchUser(userId);
		if (!switched) {
		Slogf.w(LOG_TAG, "Failed to switch to user %d", userId);
		} else {
		Slogf.d(LOG_TAG, "Switched");
		}
		return switched;
		} catch (RemoteException e) {
		@@ -11106,18 +11108,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		private @UserIdInt int getLogoutUserIdUnchecked() {
		if (!mInjector.userManagerIsHeadlessSystemUserMode()) {
		// mLogoutUserId is USER_SYSTEM as well, but there's no need to acquire the lock
		return UserHandle.USER_SYSTEM;
		}
		synchronized (getLockObject()) {
		return mLogoutUserId;
		}
		}

		private void clearLogoutUser() {
		if (!mInjector.userManagerIsHeadlessSystemUserMode()) return; // ignore

		synchronized (getLockObject()) {
		setLogoutUserIdLocked(UserHandle.USER_NULL);
		}
		@@ -11125,8 +11121,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		@GuardedBy("getLockObject()")
		private void setLogoutUserIdLocked(@UserIdInt int userId) {
		if (!mInjector.userManagerIsHeadlessSystemUserMode()) return; // ignore

		if (userId == UserHandle.USER_CURRENT) {
		userId = getCurrentForegroundUserId();
		}
		@@ -11209,8 +11203,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return UserManager.USER_OPERATION_ERROR_MANAGED_PROFILE;
		}

		// TODO(b/204585343): remove the headless system user check?
		if (mInjector.userManagerIsHeadlessSystemUserMode() && callingUserId != mInjector
		if (callingUserId != mInjector
		.binderWithCleanCallingIdentity(() -> getCurrentForegroundUserId())) {
		Slogf.d(LOG_TAG, "logoutUser(): user %d is in background, just stopping, not switching",
		callingUserId);
		@@ -11226,8 +11219,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		Preconditions.checkCallAuthorization(canManageUsers(caller)
		\|\| hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS));

		int result = logoutUserUnchecked(getCurrentForegroundUserId());
		Slogf.d(LOG_TAG, "logout called by uid %d. Result: %d", caller.getUid(), result);
		int currentUserId = getCurrentForegroundUserId();
		if (VERBOSE_LOG) {
		Slogf.v(LOG_TAG, "logout() called by uid %d; current user is %d", caller.getUid(),
		currentUserId);
		}
		int result = logoutUserUnchecked(currentUserId);
		if (VERBOSE_LOG) {
		Slogf.v(LOG_TAG, "Result of logout(): %d", result);
		}
		return result;
		}