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

Commit 74443ebd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix input when hardware renderer drawing is disabled." into tm-qpr-dev am: 0854d617 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993815



Change-Id: Ice90045eed7057cdef92ec2c1e28826222172a18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cfc0aa6 0854d617

core/java/android/view/ViewRootImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -8160,6 +8160,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;
@@ -8199,6 +8200,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();