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

Commit 64660bed authored by Robert Carr's avatar Robert Carr
Browse files

Avoid global transaction in magnifier 

It's not good to use the global transaction from the render thread
like this as the UI thread could also be using it from SurfaceView. Transaction
objects require external synchronization so we could be corrupting them.

Bug: 140070297
Test: Builds
Change-Id: I17b4c1417d45cc825fca380350c326ed6b3edcf6
parent aaf6ce29

core/java/android/widget/Magnifier.java

+7 −6
Original line number Original line Diff line number Diff line
@@ -800,6 +800,7 @@ public final class Magnifier { 
        // The surface we allocate for the magnifier content + shadow.

        // The surface we allocate for the magnifier content + shadow.

        private final SurfaceSession mSurfaceSession;

        private final SurfaceSession mSurfaceSession;

        private final SurfaceControl mSurfaceControl;

        private final SurfaceControl mSurfaceControl;

        private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction();

        private final Surface mSurface;

        private final Surface mSurface;

        // The renderer used for the allocated surface.

        // The renderer used for the allocated surface.

        private final ThreadedRenderer.SimpleRenderer mRenderer;

        private final ThreadedRenderer.SimpleRenderer mRenderer;
@@ -1081,16 +1082,16 @@ public final class Magnifier { 
                            return;

                            return;

                        }

                        }

                        // Show or move the window at the content draw frame.

                        // Show or move the window at the content draw frame.

                        SurfaceControl.openTransaction();

                        mTransaction.deferTransactionUntilSurface(mSurfaceControl, mSurface, frame);

                        mSurfaceControl.deferTransactionUntil(mSurface, frame);

                        if (updateWindowPosition) {

                        if (updateWindowPosition) {

                            mSurfaceControl.setPosition(pendingX, pendingY);

                            mTransaction.setPosition(mSurfaceControl, pendingX, pendingY);

                        }

                        }

                        if (firstDraw) {

                        if (firstDraw) {

                            mSurfaceControl.setLayer(SURFACE_Z);

                            mTransaction.setLayer(mSurfaceControl, SURFACE_Z)

                            mSurfaceControl.show();

                                .show(mSurfaceControl);



                        }

                        }

                        SurfaceControl.closeTransaction();

                        mTransaction.apply();

                    };

                    };

                    mRenderer.setLightCenter(mDisplay, pendingX, pendingY);

                    mRenderer.setLightCenter(mDisplay, pendingX, pendingY);

                } else {

                } else {