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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452 Change-Id: I49522105e82ee2d63fd84f7ab56fb3e11d87b5c7
2020-11-05 06:00:08 +00:00
parent c82f075f92 57675a19e0
commit 4349a76d6f
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