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

Commit d06b3307 authored by Shu Chen's avatar Shu Chen
Browse files

Makes sure the magnifier source bounds doesn't beyond the surface. 

Test: locally verified.
Bug: 150122887
Change-Id: I3df94f0f073197f4a321faac24fa222f9dbb1674
parent 3f9ddc30

core/java/android/widget/Magnifier.java

+3 −2
Original line number Diff line number Diff line
@@ -353,8 +353,9 @@ public final class Magnifier { 


            // Gets the startX for new style, which should be bounded by the horizontal bounds.

            // Also calculates the left/right cut width for pixel copy.

            leftBound += mViewCoordinatesInSurface[0];

            rightBound += mViewCoordinatesInSurface[0];

            leftBound = Math.max(leftBound + mViewCoordinatesInSurface[0], 0);

            rightBound = Math.min(

                rightBound + mViewCoordinatesInSurface[0], mContentCopySurface.mWidth);

            mLeftCutWidth = Math.max(0, leftBound - startX);

            mRightCutWidth = Math.max(0, startX + mSourceWidth - rightBound);

            startX = Math.max(startX, leftBound);