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

Commit 4972f329 authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(magnification): ensure the old path is cleared when hiding the... 

Merge "fix(magnification): ensure the old path is cleared when hiding the fullscreen border" into main
parents db0932b5 00226f77

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

+13 −5
Original line number Diff line number Diff line
@@ -1209,6 +1209,7 @@ final class AccessibilityController { 
                private boolean mShown;

                private boolean mLastSurfaceShown;

                private int mAlpha;

                private int mPreviousAlpha;



                private volatile boolean mInvalidated;
@@ -1344,6 +1345,7 @@ final class AccessibilityController { 
                    // using WindowManagerGlobalLock. Grab copies of these values before

                    // drawing on the canvas so that drawing can be performed outside of the lock.

                    int alpha;

                    boolean redrawBounds;

                    Rect drawingRect = null;

                    Region drawingBounds = null;

                    synchronized (mService.mGlobalLock) {
@@ -1361,7 +1363,13 @@ final class AccessibilityController { 
                        mInvalidated = false;



                        alpha = mAlpha;

                        if (alpha > 0) {

                        // For b/325863281, we should ensure the drawn border path is cleared when

                        // alpha = 0. Therefore, we cache the last used alpha when drawing as

                        // mPreviousAlpha and check it here. If mPreviousAlpha > 0, which means

                        // the border is showing now, then we should still redraw the clear path

                        // on the canvas so the border is cleared.

                        redrawBounds = mAlpha > 0 || mPreviousAlpha > 0;

                        if (redrawBounds) {

                            drawingBounds = new Region(mBounds);

                            // Empty dirty rectangle means unspecified.

                            if (mDirtyRect.isEmpty()) {
@@ -1378,7 +1386,7 @@ final class AccessibilityController { 


                    final boolean showSurface;

                    // Draw without holding WindowManagerGlobalLock.

                    if (alpha > 0) {

                    if (redrawBounds) {

                        Canvas canvas = null;

                        try {

                            canvas = mSurface.lockCanvas(drawingRect);
@@ -1392,11 +1400,11 @@ final class AccessibilityController { 
                        mPaint.setAlpha(alpha);

                        canvas.drawPath(drawingBounds.getBoundaryPath(), mPaint);

                        mSurface.unlockCanvasAndPost(canvas);

                        showSurface = true;

                    } else {

                        showSurface = false;

                        mPreviousAlpha = alpha;

                    }



                    showSurface = alpha > 0;



                    if (showSurface && !mLastSurfaceShown) {

                        mTransaction.show(mSurfaceControl).apply();

                        mLastSurfaceShown = true;