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

Commit 7ae85cc1 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Sync transform of mirrored surface with the source" into udc-qpr-dev am: 19d00b94 

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



Change-Id: I2bae8ad85ba47e9d829dc64d2efe5db3403660e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9336c548 19d00b94

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

+3 −3
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ final class ContentRecorder implements WindowContainerListener { 
                                    + "%d to new bounds %s and/or orientation %d.",

                            mDisplayContent.getDisplayId(), recordedContentBounds,

                            recordedContentOrientation);

                    updateMirroredSurface(mDisplayContent.mWmService.mTransactionFactory.get(),

                    updateMirroredSurface(mRecordedWindowContainer.getSyncTransaction(),

                            recordedContentBounds, surfaceSize);

                } else {

                    // If the surface removed, do nothing. We will handle this via onDisplayChanged
@@ -325,6 +325,7 @@ final class ContentRecorder implements WindowContainerListener { 
                        .reparent(mDisplayContent.getOverlayLayer(), null);

        // Retrieve the size of the DisplayArea to mirror.

        updateMirroredSurface(transaction, mRecordedWindowContainer.getBounds(), surfaceSize);

        transaction.apply();



        // Notify the client about the visibility of the mirrored region, now that we have begun

        // capture.
@@ -481,8 +482,7 @@ final class ContentRecorder implements WindowContainerListener { 
                .setMatrix(mRecordedSurface, scale, 0 /* dtdx */, 0 /* dtdy */, scale)

                // Position needs to be updated when the mirrored DisplayArea has changed, since

                // the content will no longer be centered in the output surface.

                .setPosition(mRecordedSurface, shiftedX /* x */, shiftedY /* y */)

                .apply();

                .setPosition(mRecordedSurface, shiftedX /* x */, shiftedY /* y */);

        mLastRecordedBounds = new Rect(recordedContentBounds);

        // Request to notify the client about the resize.

        mMediaProjectionManager.notifyActiveProjectionCapturedContentResized(