Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: d4313a6d0f

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

Change-Id: Ic5b96ccbba713327c70a62ba584129ab20f35db6
This commit is contained in:
James Mattis
2020-11-05 05:49:10 +00:00
committed by Automerger Merge Worker
parent 64363d8b8d d4313a6d0f
commit 632960f643
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -359,7 +359,7 @@ public class NetworkCapabilitiesTest {
assertFalse(nr.satisfiedByNetworkCapabilities(new NetworkCapabilities())); assertFalse(nr.satisfiedByNetworkCapabilities(new NetworkCapabilities()));
} }
@Test @Test @IgnoreUpTo(Build.VERSION_CODES.R)
public void testOemPrivate() { public void testOemPrivate() {
NetworkCapabilities nc = new NetworkCapabilities(); NetworkCapabilities nc = new NetworkCapabilities();
// By default OEM_PRIVATE is neither in the unwanted or required lists and the network is // By default OEM_PRIVATE is neither in the unwanted or required lists and the network is