From b5cc74279d4751ffe59a11ed2b3e575c4807e96b Mon Sep 17 00:00:00 2001
From: James Mattis <jmattis@google.com>
Date: Wed, 25 Nov 2020 15:34:11 -0800
Subject: [PATCH] Adding @IgnoreUpTo to OemNetworkPreferencesTest

Adding @IgnoreUpTo to OemNetworkPreferencesTest so that it can run as
part of MTS.

Bug: 174268969
Bug: 171505922
Test: atest FrameworksNetTests:android.net.OemNetworkPreferencesTest
Change-Id: If7fb039c2cdb061f803c8a59e826e485e1f1c761
---
 .../common/java/android/net/OemNetworkPreferencesTest.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/net/common/java/android/net/OemNetworkPreferencesTest.java b/tests/net/common/java/android/net/OemNetworkPreferencesTest.java
index b77ed6ab5a..c9161b6d64 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 {