Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: b15efe2545 am: 57675a19e0 am: 4349a76d6f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452 Change-Id: I3f6ba3a835372b423c9edd4c9a986189b1b59039
2020-11-05 06:51:26 +00:00
parent 26004aeff9 4349a76d6f
commit 42b1a1b729
1 changed files with 1 additions and 1 deletions
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -359,7 +359,7 @@ public class NetworkCapabilitiesTest {
        assertFalse(nr.satisfiedByNetworkCapabilities(new NetworkCapabilities()));
    }

-    @Test
+    @Test @IgnoreUpTo(Build.VERSION_CODES.R)
    public void testOemPrivate() {
        NetworkCapabilities nc = new NetworkCapabilities();
        // By default OEM_PRIVATE is neither in the unwanted or required lists and the network is