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

Commit 4f58dc16 authored by Brett Chabot's avatar Brett Chabot
Browse files

Fix input when hardware renderer drawing is disabled. 

When drawing is disabled the window's layer won't have a valid buffer. This
causes surfaceflinger to set the window's touchableRegion to zero.
This commit sets a window crop when drawing is disabled, so surfaceflinger
set touchableregion from crop instead of buffer.
And it modifies LetterboxUiController to not reset the crop.

Test: cts and perf tests as documented in go/android-slimulator-dev-env
Bug: 229870984
(cherry picked from commit 32dfc983)
Merged-In: I4d6ca513c3daf5818ded03eae00e551fc319ad69
Change-Id: Ic8e1b17af825951505d448509530edf3ea81af5b
parent 40d3988a

core/java/android/view/ViewRootImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -8152,6 +8152,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;
@@ -8191,6 +8192,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);

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

+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();