Merge "Report correct display id in stack info" into oc-dev (7642a80e) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3942,10 +3942,11 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
	}		}

	private StackInfo getStackInfoLocked(ActivityStack stack) {		private StackInfo getStackInfoLocked(ActivityStack stack) {
	final ActivityDisplay display = mActivityDisplays.get(DEFAULT_DISPLAY);		final int displayId = stack.mDisplayId;
			final ActivityDisplay display = mActivityDisplays.get(displayId);
	StackInfo info = new StackInfo();		StackInfo info = new StackInfo();
	stack.getWindowContainerBounds(info.bounds);		stack.getWindowContainerBounds(info.bounds);
	info.displayId = DEFAULT_DISPLAY;		info.displayId = displayId;
	info.stackId = stack.mStackId;		info.stackId = stack.mStackId;
	info.userId = stack.mCurrentUser;		info.userId = stack.mCurrentUser;
	info.visible = stack.shouldBeVisible(null) == STACK_VISIBLE;		info.visible = stack.shouldBeVisible(null) == STACK_VISIBLE;