LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07 am: 6180b47f92

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796369

Change-Id: Id02a4659d9e27a6fffc075cdaac878c94a436f42
This commit is contained in:
Remi NGUYEN VAN
2021-08-17 03:08:16 +00:00
committed by Automerger Merge Worker
parent 0c0b45e6b5 6180b47f92
commit 882c640caa
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ import android.util.Range;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.CompatUtil;
import com.android.testutils.ConnectivityModuleTest;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
@@ -1168,7 +1169,7 @@ public class NetworkCapabilitiesTest {
assertEquals(0, nc.getCapabilities().length);
}
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
@Test @IgnoreUpTo(Build.VERSION_CODES.R) @ConnectivityModuleTest
public void testRestrictCapabilitiesForTestNetwork() {
final int ownerUid = 1234;
final int[] administratorUids = {1001, ownerUid};