Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 632960f6 authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d am: d4313a6d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: Ic5b96ccbba713327c70a62ba584129ab20f35db6
parents 64363d8b d4313a6d

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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