Merge "Fix bubble transition hanging issues" into rvc-dev am: c6690dd46b (9fe6bf67) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayContent.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -5613,6 +5613,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		}

		void onDisplayChanged() {
		mDisplay.getRealSize(mTmpDisplaySize);
		setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);
		updateDisplayInfo();

		// The window policy is responsible for stopping activities on the default display.
		final int displayId = mDisplay.getDisplayId();
		if (displayId != DEFAULT_DISPLAY) {
		@@ -5624,10 +5628,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		mOffToken = null;
		}
		}

		mDisplay.getRealSize(mTmpDisplaySize);
		setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);
		updateDisplayInfo();
		mWmService.requestTraversal();
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -2288,6 +2288,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false);
		}
		stack.awakeFromSleepingLocked();
		if (display.isSingleTaskInstance()) {
		display.executeAppTransition();
		}
		if (stack.isFocusedStackOnDisplay()
		&& !mStackSupervisor.getKeyguardController()
		.isKeyguardOrAodShowing(display.mDisplayId)) {