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

Commit 547d5c78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant call to... 

Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main am: 7e855b12

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



Change-Id: I107cadb64d96503f1dd1c7e423dbe15b337f9bdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8cb041d 7e855b12

services/tests/servicestests/src/com/android/server/accessibility/ProxyManagerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ public class ProxyManagerTest { 


    @Before

    public void setup() throws RemoteException {

        mSetFlagsRule.initAllFlagsToReleaseConfigDefault();



        MockitoAnnotations.initMocks(this);

        final Resources resources = InstrumentationRegistry.getContext().getResources();

services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java

+0 −2
Original line number Diff line number Diff line
@@ -338,8 +338,6 @@ public class VirtualDeviceManagerServiceTest { 
        LocalServices.removeServiceForTest(DisplayManagerInternal.class);

        LocalServices.addService(DisplayManagerInternal.class, mDisplayManagerInternalMock);



        mSetFlagsRule.initAllFlagsToReleaseConfigDefault();



        doReturn(true).when(mInputManagerInternalMock).setVirtualMousePointerDisplayId(anyInt());

        doNothing().when(mInputManagerInternalMock).setPointerAcceleration(anyFloat(), anyInt());

        doNothing().when(mInputManagerInternalMock).setPointerIconVisible(anyBoolean(), anyInt());

services/tests/wmtests/src/com/android/server/wm/DisplayContentDeferredUpdateTests.java

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ public class DisplayContentDeferredUpdateTests extends WindowTestsBase { 


    @Override

    protected void onBeforeSystemServicesCreated() {

        // Set other flags to their default values

        mSetFlagsRule.initAllFlagsToReleaseConfigDefault();



        mSetFlagsRule.enableFlags(Flags.FLAG_DEFER_DISPLAY_UPDATES);

    }