Merge "Ignore testReevaluateNetwork until Q" into rvc-dev am: b6b0aee6

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import android.os.Build;

import android.os.RemoteException;

import android.os.RemoteException;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@SmallTest

@SmallTest

public class CaptivePortalTest {

public class CaptivePortalTest {

    @Rule

    public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule();

    private static final int DEFAULT_TIMEOUT_MS = 5000;

    private static final int DEFAULT_TIMEOUT_MS = 5000;

    private static final String TEST_PACKAGE_NAME = "com.google.android.test";

    private static final String TEST_PACKAGE_NAME = "com.google.android.test";

        assertEquals(result.mCode, CaptivePortal.APP_RETURN_WANTED_AS_IS);

        assertEquals(result.mCode, CaptivePortal.APP_RETURN_WANTED_AS_IS);

    }

    }

    @IgnoreUpTo(Build.VERSION_CODES.Q)

    @Test

    @Test

    public void testReevaluateNetwork() {

    public void testReevaluateNetwork() {

        final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.reevaluateNetwork());

        final MyCaptivePortalImpl result = runCaptivePortalTest(c -> c.reevaluateNetwork());