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

Commit e1b2a0a9 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main

parents 1f447a8e f0990adb

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

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




    @Before

    @Before

    public void setup() throws RemoteException {

    public void setup() throws RemoteException {

        mSetFlagsRule.initAllFlagsToReleaseConfigDefault();



        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

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

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

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -339,7 +339,6 @@ public class VirtualDeviceManagerServiceTest { 
        LocalServices.removeServiceForTest(DisplayManagerInternal.class);

        LocalServices.removeServiceForTest(DisplayManagerInternal.class);

        LocalServices.addService(DisplayManagerInternal.class, mDisplayManagerInternalMock);

        LocalServices.addService(DisplayManagerInternal.class, mDisplayManagerInternalMock);





        mSetFlagsRule.initAllFlagsToReleaseConfigDefault();

        mSetFlagsRule.enableFlags(com.android.input.flags.Flags.FLAG_ENABLE_POINTER_CHOREOGRAPHER);

        mSetFlagsRule.enableFlags(com.android.input.flags.Flags.FLAG_ENABLE_POINTER_CHOREOGRAPHER);





        doNothing().when(mInputManagerInternalMock)

        doNothing().when(mInputManagerInternalMock)

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

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




    @Override

    @Override

    protected void onBeforeSystemServicesCreated() {

    protected void onBeforeSystemServicesCreated() {

        // Set other flags to their default values

        mSetFlagsRule.initAllFlagsToReleaseConfigDefault();



        mSetFlagsRule.enableFlags(Flags.FLAG_DEFER_DISPLAY_UPDATES);

        mSetFlagsRule.enableFlags(Flags.FLAG_DEFER_DISPLAY_UPDATES);

    }

    }