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

Commit 738c00d1 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d" into oc-dr1-dev-plus-aosp

parents f2a1546c d42c1645
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;

@SmallTest
@RunWith(AndroidJUnit4.class)
@Ignore("Flaky")
public class NetworkControllerDataTest extends NetworkControllerBaseTest {

    @Test
@@ -106,7 +107,6 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
                TelephonyIcons.QS_DATA_4G);
    }

    @Ignore("Flaky")
    @Test
    public void testDataDisabledIcon() {
        setupNetworkController();
+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settingslib.net.DataUsageController;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.SignalDrawable;

import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -47,6 +48,7 @@ import static org.mockito.Mockito.mock;

@SmallTest
@RunWith(AndroidJUnit4.class)
@Ignore("Flaky")
public class NetworkControllerSignalTest extends NetworkControllerBaseTest {

    @Test