Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be9db2b3 authored Jun 25, 2024 by Riddle Hsu

Clean up launched flag removePrepareSurfaceInPlacement

It was enabled in previous release.

Flag: EXEMPT flag cleanup
Bug: 330721336
Test: CtsWindowManagerDeviceWindow
Change-Id: Iaf6ad2a21dda4e05303ec7d1fdb9c363abaab40e

parent b770541d

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -52,17 +52,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "remove_prepare_surface_in_placement"
		namespace: "windowing_frontend"
		description: "Reduce unnecessary invocation to improve performance"
		bug: "330721336"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "close_to_square_config_includes_status_bar"
		namespace: "windowing_frontend"

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -5047,9 +5047,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		} finally {
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		}
		if (!com.android.window.flags.Flags.removePrepareSurfaceInPlacement()) {
		prepareSurfaces();
		}

		// This should be called after the insets have been dispatched to clients and we have
		// committed finish drawing windows.

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -4804,8 +4804,7 @@ class Task extends TaskFragment {
		// task is still updated by core. Otherwise if the task is collected (e.g.
		// rotation change) after leaving this scope, the visibility operation will be
		// put in sync transaction, then it is not synced with reparent.
		if (com.android.window.flags.Flags.removePrepareSurfaceInPlacement()
		&& lastParentBeforePip.mSyncState == SYNC_STATE_NONE) {
		if (lastParentBeforePip.mSyncState == SYNC_STATE_NONE) {
		lastParentBeforePip.prepareSurfaces();
		// If the moveToFront is a part of finishing transition, then make sure
		// the z-order of tasks are up-to-date.

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -5014,12 +5014,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		anim.restrictDuration(MAX_ANIMATION_DURATION);
		anim.scaleCurrentDuration(mWmService.getWindowAnimationScaleLocked());
		final Point position = new Point();
		if (com.android.window.flags.Flags.removePrepareSurfaceInPlacement()) {
		transformFrameToSurfacePosition(mWindowFrames.mFrame.left, mWindowFrames.mFrame.top,
		position);
		} else {
		position.set(mSurfacePosition);
		}
		final AnimationAdapter adapter = new LocalAnimationAdapter(
		new WindowAnimationSpec(anim, position, false /* canSkipFirstFrame */,
		0 /* windowCornerRadius */),