Merge "Fix input when hardware renderer drawing is disabled." into tm-qpr-dev (0854d617) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -8158,6 +8158,7 @@ public final class ViewRootImpl implements ViewParent,
		mLastSyncSeqId, mTmpFrames, mPendingMergedConfiguration, mSurfaceControl,
		mTempInsets, mTempControls, mRelayoutBundle);
		mRelayoutRequested = true;

		final int maybeSyncSeqId = mRelayoutBundle.getInt("seqid");
		if (maybeSyncSeqId > 0) {
		mSyncSeqId = maybeSyncSeqId;
		@@ -8197,6 +8198,12 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		if (mSurfaceControl.isValid() && !HardwareRenderer.isDrawingEnabled()) {
		// When drawing is disabled the window layer won't have a valid buffer.
		// Set a window crop so input can get delivered to the window.
		mTransaction.setWindowCrop(mSurfaceControl, mSurfaceSize.x, mSurfaceSize.y).apply();
		}

		mLastTransformHint = transformHint;

		mSurfaceControl.setTransformHint(transformHint);

+1 −1

Original line number	Diff line number	Diff line
		@@ -481,7 +481,7 @@ final class LetterboxUiController {
		}

		private void updateRoundedCorners(WindowState mainWindow) {
		final SurfaceControl windowSurface = mainWindow.getClientViewRootSurface();
		final SurfaceControl windowSurface = mainWindow.getSurfaceControl();
		if (windowSurface != null && windowSurface.isValid()) {
		final Transaction transaction = mActivityRecord.getSyncTransaction();