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

Commit ce3c0eab authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "fix(#Magnification): presubmit error on... 

Merge "Merge "fix(#Magnification): presubmit error on WindowMagnificationManagerTest" into udc-dev am: c0f8d1ba am: 390d48a6" into udc-d1-dev-plus-aosp am: d442f971

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



Change-Id: I309ada9b663ad2c60dcead68272bef5a015884be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd4c4b78 d442f971

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

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.server.accessibility.AccessibilityTraceManager; 
import com.android.server.statusbar.StatusBarManagerInternal;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.mockito.Mock;

import org.mockito.Mockito;
@@ -307,6 +308,7 @@ public class WindowMagnificationManagerTest { 
                MagnificationScaleProvider.MAX_SCALE);

    }



    @Ignore("b/278816260: We could refer to b/182561174#comment4 for solution.")

    @Test

    public void logTrackingTypingFocus_processScroll_logDuration() {

        WindowMagnificationManager spyWindowMagnificationManager = spy(mWindowMagnificationManager);