Merge "Revert "Fix exit from DW for Transparent activities"" into main (56a5da35) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -750,11 +750,6 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
		released = true;
		}

		if (mTaskSurface != null) {
		t.unsetColor(mTaskSurface);
		released = true;
		}

		if (released) {
		t.apply();
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -483,15 +483,20 @@ abstract class WindowDecoration2<T>(
		/** Releases all window decoration views. */
		private fun releaseViews(wct: WindowContainerTransaction) {
		val t = surfaceControlTransactionSupplier()
		var released = false

		decorationContainerSurface?.let {
		t.remove(it)
		decorationContainerSurface = null
		released = true
		}

		t.unsetColor(taskSurface)
		released = released or (captionController?.releaseViews(wct, t) == true)

		if (released) {
		t.apply()
		}
		}

		override fun close() =
		traceSection(traceTag = Trace.TRACE_TAG_WINDOW_MANAGER, name = "WindowDecoration2#close") {

+1 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		@@ -1355,8 +1354,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase {

		spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion);

		// Apply is also invoked when the color of the Task Surface is reset.
		verify(mMockTransaction, times(2)).apply();
		verify(mMockTransaction).apply();
		verify(mMockRootSurfaceControl, never()).applyTransactionOnDraw(any());
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -400,9 +400,7 @@ public class WindowDecorationTests extends ShellTestCase {
		windowDecor.relayout(taskInfo, true /* hasGlobalFocus */);

		verify(mMockWindowDecorViewHost, never()).release(any());
		// Apply is invoked because a task surfaces needs to be always reset with unsetColor.
		verify(t).unsetColor(any());
		verify(t).apply();
		verify(t, never()).apply();
		verify(mMockWindowContainerTransaction, never())
		.removeInsetsSource(eq(taskInfo.token), any(), anyInt(), anyInt());