Merge "WindowStateAnimator: Remove mSurfaceResized" (2577976f) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −6

Original line number	Diff line number	Diff line
		@@ -1801,6 +1801,12 @@
		"group": "WM_DEBUG_FOCUS_LIGHT",
		"at": "com\/android\/server\/wm\/DisplayContent.java"
		},
		"625447638": {
		"message": "Resize reasons for w=%s: %s configChanged=%b dragResizingChanged=%b reportOrientationChanged=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_RESIZE",
		"at": "com\/android\/server\/wm\/WindowState.java"
		},
		"628276090": {
		"message": "Delaying app transition for screen rotation animation to finish",
		"level": "VERBOSE",
		@@ -2113,12 +2119,6 @@
		"group": "WM_DEBUG_WINDOW_ORGANIZER",
		"at": "com\/android\/server\/wm\/DisplayAreaOrganizerController.java"
		},
		"1160771501": {
		"message": "Resize reasons for w=%s: %s surfaceResized=%b configChanged=%b dragResizingChanged=%b reportOrientationChanged=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_RESIZE",
		"at": "com\/android\/server\/wm\/WindowState.java"
		},
		"1166381079": {
		"message": "Execute app transition: %s, displayId: %d Callers=%s",
		"level": "WARN",

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -1409,15 +1409,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		// Add a window that is using blastSync to the resizing list if it hasn't been reported
		// already. This because the window is waiting on a finishDrawing from the client.
		if (didFrameInsetsChange
		\|\| winAnimator.mSurfaceResized
		\|\| configChanged
		\|\| dragResizingChanged
		\|\| mReportOrientationChanged
		\|\| shouldSendRedrawForSync()) {
		ProtoLog.v(WM_DEBUG_RESIZE,
		"Resize reasons for w=%s: %s surfaceResized=%b configChanged=%b "
		"Resize reasons for w=%s: %s configChanged=%b "
		+ "dragResizingChanged=%b reportOrientationChanged=%b",
		this, mWindowFrames.getInsetsChangedInfo(), winAnimator.mSurfaceResized,
		this, mWindowFrames.getInsetsChangedInfo(),
		configChanged, dragResizingChanged, mReportOrientationChanged);

		// If it's a dead window left on screen, and the configuration changed, there is nothing
		@@ -3633,7 +3632,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		// that may cause WINDOW_FREEZE_TIMEOUT because resizing the client keeps failing.
		mReportOrientationChanged = false;
		mDragResizingChangeReported = true;
		mWinAnimator.mSurfaceResized = false;
		mWindowFrames.resetInsetsChanged();

		final MergedConfiguration mergedConfiguration = mLastReportedConfiguration;

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

+2 −15

Original line number	Diff line number	Diff line
		@@ -121,12 +121,6 @@ class WindowStateAnimator {

		boolean mAnimationIsEntrance;

		/**
		* Set when we have changed the size of the surface, to know that
		* we must tell them application to resize (and thus redraw itself).
		*/
		boolean mSurfaceResized;

		WindowSurfaceController mSurfaceController;
		private WindowSurfaceController mPendingDestroySurface;

		@@ -788,10 +782,8 @@ class WindowStateAnimator {
		// to find the surface size changed underneath it.
		final boolean relayout = !w.mRelayoutCalled \|\| w.mInRelayout;
		if (relayout) {
		mSurfaceResized = mSurfaceController.setBufferSizeInTransaction(
		mSurfaceController.setBufferSizeInTransaction(
		mTmpSize.width(), mTmpSize.height(), recoveringMemory);
		} else {
		mSurfaceResized = false;
		}
		// If we are undergoing seamless rotation, the surface has already
		// been set up to persist at it's old location. We need to freeze
		@@ -866,10 +858,6 @@ class WindowStateAnimator {
		mDsDy * w.mVScale, recoveringMemory);
		}
		}

		if (mSurfaceResized) {
		mWin.getDisplayContent().pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;
		}
		}

		/**
		@@ -1288,8 +1276,7 @@ class WindowStateAnimator {
		pw.print(prefix); pw.print("mPendingDestroySurface=");
		pw.println(mPendingDestroySurface);
		}
		if (mSurfaceResized \|\| mSurfaceDestroyDeferred) {
		pw.print(prefix); pw.print("mSurfaceResized="); pw.print(mSurfaceResized);
		if (mSurfaceDestroyDeferred) {
		pw.print(" mSurfaceDestroyDeferred="); pw.println(mSurfaceDestroyDeferred);
		}
		if (mShownAlpha != 1 \|\| mAlpha != 1 \|\| mLastAlpha != 1) {