Merge "Need to updateSurface if surface size was changed in relayoutWindow" (dd148eaf) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -1638,6 +1638,8 @@ public final class ViewRootImpl implements ViewParent,
		final boolean stableInsetsChanged = !mPendingStableInsets.equals(
		mAttachInfo.mStableInsets);
		final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets);
		final boolean surfaceSizeChanged = (relayoutResult
		& WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0;
		if (contentInsetsChanged) {
		mAttachInfo.mContentInsets.set(mPendingContentInsets);
		if (DEBUG_LAYOUT) Log.v(TAG, "Content insets changing to: "
		@@ -1723,10 +1725,20 @@ public final class ViewRootImpl implements ViewParent,
		mAttachInfo.mHardwareRenderer.isEnabled()) {
		mAttachInfo.mHardwareRenderer.destroy();
		}
		} else if (surfaceGenerationId != mSurface.getGenerationId() &&
		mSurfaceHolder == null && mAttachInfo.mHardwareRenderer != null) {
		} else if ((surfaceGenerationId != mSurface.getGenerationId()
		\|\| surfaceSizeChanged)
		&& mSurfaceHolder == null
		&& mAttachInfo.mHardwareRenderer != null) {
		mFullRedrawNeeded = true;
		try {
		// Need to do updateSurface (which leads to CanvasContext::setSurface and
		// re-create the EGLSurface) if either the Surface changed (as indicated by
		// generation id), or WindowManager changed the surface size. The latter is
		// because on some chips, changing the consumer side's BufferQueue size may
		// not take effect immediately unless we create a new EGLSurface.
		// Note that frame size change doesn't always imply surface size change (eg.
		// drag resizing uses fullscreen surface), need to check surfaceSizeChanged
		// flag from WindowManager.
		mAttachInfo.mHardwareRenderer.updateSurface(mSurface);
		} catch (OutOfResourcesException e) {
		handleOutOfResourcesException(e);

core/java/android/view/WindowManagerGlobal.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,11 @@ public final class WindowManagerGlobal {
		*/
		public static final int RELAYOUT_RES_DRAG_RESIZING = 0x8;

		/**
		* The window manager has changed the size of the surface from the last call.
		*/
		public static final int RELAYOUT_RES_SURFACE_RESIZED = 0x10;

		/**
		* Flag for relayout: the client will be later giving
		* internal insets; as a result, the window will not impact other window

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -2725,6 +2725,8 @@ public class WindowManagerService extends IWindowManager.Stub
		WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
		}

		final int oldSurfaceResizeGeneration = winAnimator.mSurfaceResizeGeneration;

		win.setDisplayLayoutNeeded();
		win.mGivenInsetsPending = (flags&WindowManagerGlobal.RELAYOUT_INSETS_PENDING) != 0;
		configChanged = updateOrientationFromAppTokensLocked(false);
		@@ -2737,6 +2739,9 @@ public class WindowManagerService extends IWindowManager.Stub
		if (win.mAppToken != null) {
		win.mAppToken.updateReportedVisibilityLocked();
		}
		if (winAnimator.mSurfaceResizeGeneration != oldSurfaceResizeGeneration) {
		result \|= WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED;
		}
		outFrame.set(win.mCompatFrame);
		outOverscanInsets.set(win.mOverscanInsets);
		outContentInsets.set(win.mContentInsets);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ class WindowStateAnimator {
		* we must tell them application to resize (and thus redraw itself).
		*/
		boolean mSurfaceResized;
		int mSurfaceResizeGeneration;
		WindowSurfaceController mSurfaceController;
		private WindowSurfaceController mPendingDestroySurface;

		@@ -1183,6 +1184,7 @@ class WindowStateAnimator {
		recoveringMemory);

		if (mSurfaceResized) {
		mSurfaceResizeGeneration++;
		mAnimator.setPendingLayoutChanges(w.getDisplayId(),
		WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER);
		w.applyDimLayerIfNeeded();