summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-11-30 02:24:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-30 02:24:57 +0000
commit5071265e749be03312a849bf3cd48d16a7670f7d (patch)
treea946b5f242a97cab5e4918424904c60ac1169097
parentf18e48e53ca748218da2cc89bfe191e734065b69 (diff)
parent43c0e2a139d4ad7a70add680b885bf70fd848807 (diff)
Merge "Adding @IgnoreUpTo to OemNetworkPreferencesTest" am: 4450ca52cb am: 43c0e2a139
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511772 Change-Id: I6d89952b92960388319c516858ffbc08fd69b058
-rw-r--r--tests/net/common/java/android/net/OemNetworkPreferencesTest.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/net/common/java/android/net/OemNetworkPreferencesTest.java b/tests/net/common/java/android/net/OemNetworkPreferencesTest.java
index b77ed6ab5a29..c9161b6d6441 100644
--- a/tests/net/common/java/android/net/OemNetworkPreferencesTest.java
+++ b/tests/net/common/java/android/net/OemNetworkPreferencesTest.java
@@ -22,11 +22,14 @@ import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import android.os.Build;
import android.util.SparseArray;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
+import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,6 +37,7 @@ import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.List;
+@IgnoreUpTo(Build.VERSION_CODES.R)
@RunWith(AndroidJUnit4.class)
@SmallTest
public class OemNetworkPreferencesTest {