Merge "Allow to show non-current users." (650c211a) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −6

Original line number	Diff line number	Diff line
		@@ -373,12 +373,6 @@
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/TransitionController.java"
		},
		"-1750384749": {
		"message": "Launch on display check: allow launch on public display",
		"level": "DEBUG",
		"group": "WM_DEBUG_TASKS",
		"at": "com\/android\/server\/wm\/ActivityTaskSupervisor.java"
		},
		"-1750206390": {
		"message": "Exception thrown when creating surface for client %s (%s). %s",
		"level": "WARN",
		@@ -907,6 +901,12 @@
		"group": "WM_DEBUG_BOOT",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-1253056469": {
		"message": "Launch on display check: %s launch for userId=%d on displayId=%d",
		"level": "DEBUG",
		"group": "WM_DEBUG_TASKS",
		"at": "com\/android\/server\/wm\/ActivityTaskSupervisor.java"
		},
		"-1248645819": {
		"message": "\tAdd container=%s",
		"level": "DEBUG",

+1 −2

Original line number	Diff line number	Diff line
		@@ -1641,7 +1641,7 @@ class UserController implements Handler.Callback {
		}
		mInjector.updateUserConfiguration();
		updateCurrentProfileIds();
		mInjector.getWindowManager().setCurrentUser(userId, getCurrentProfileIds());
		mInjector.getWindowManager().setCurrentUser(userId);
		mInjector.reportCurWakefulnessUsageEvent();
		// Once the internal notion of the active user has switched, we lock the device
		// with the option to show the user switcher on the keyguard.
		@@ -1655,7 +1655,6 @@ class UserController implements Handler.Callback {
		} else {
		final Integer currentUserIdInt = mCurrentUserId;
		updateCurrentProfileIds();
		mInjector.getWindowManager().setCurrentProfileIds(getCurrentProfileIds());
		synchronized (mLock) {
		mUserLru.remove(currentUserIdInt);
		mUserLru.add(currentUserIdInt);

+1 −1

Original line number	Diff line number	Diff line
		@@ -9562,7 +9562,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		@Override
		boolean showToCurrentUser() {
		return mShowForAllUsers \|\| mWmService.isCurrentProfile(mUserId);
		return mShowForAllUsers \|\| mWmService.isUserVisible(mUserId);
		}

		@Override

+8 −4

Original line number	Diff line number	Diff line
		@@ -1183,10 +1183,14 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		}

		if (!displayContent.isPrivate()) {
		// Anyone can launch on a public display.
		ProtoLog.d(WM_DEBUG_TASKS, "Launch on display check: allow launch on public "
		+ "display");
		return true;
		// Checks if the caller can be shown in the given public display.
		int userId = UserHandle.getUserId(callingUid);
		int displayId = display.getDisplayId();
		boolean allowed = mWindowManager.mUmInternal.isUserVisible(userId, displayId);
		ProtoLog.d(WM_DEBUG_TASKS,
		"Launch on display check: %s launch for userId=%d on displayId=%d",
		(allowed ? "allow" : "disallow"), userId, displayId);
		return allowed;
		}

		// Check if the caller is the owner of the display.

+1 −1

Original line number	Diff line number	Diff line
		@@ -2916,7 +2916,7 @@ class Task extends TaskFragment {
		@Override
		boolean showToCurrentUser() {
		return mForceShowForAllUsers \|\| showForAllUsers()
		\|\| mWmService.isCurrentProfile(getTopMostTask().mUserId);
		\|\| mWmService.isUserVisible(getTopMostTask().mUserId);
		}

		void setForceShowForAllUsers(boolean forceShowForAllUsers) {