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

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

Merge "refactor(#AlwaysOnMagnifier): Use real controller instead of mock in... 

Merge "refactor(#AlwaysOnMagnifier): Use real controller instead of mock in MagnificationControllerTest"
parents 4d487a40 f8ce15fa

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java

+0 −3
Original line number Diff line number Diff line
@@ -410,9 +410,6 @@ public class MagnificationController implements WindowMagnificationManager.Callb 
    public void onRequestMagnificationSpec(int displayId, int serviceId) {

        final WindowMagnificationManager windowMagnificationManager;

        synchronized (mLock) {

            if (serviceId == MAGNIFICATION_GESTURE_HANDLER_ID) {

                return;

            }

            updateMagnificationButton(displayId, ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

            windowMagnificationManager = mWindowMagnificationMgr;

        }

services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java

+147 −136

File changed.

Preview size limit exceeded, changes collapsed.