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

Merge changes from topics "ADD_JVMOVERLOADS", "VPN_NETWORK_PREFERENCE"

Browse Source 
* changes:
  Add HostsideVpnTests for testing setVpnDefaultForUids()
  Add CTS for ConnectivityManager#setVpnDefaultForUids()
  Create a new API to make a set of UIDs use only VPN by default
This commit is contained in:
Lucas Lin
2022-12-21 01:13:47 +00:00
committed by Gerrit Code Review
parent d8e8fa3ab4 cf52cee443
commit e0e9b0c701
10 changed files with 340 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/java/com/android/server/connectivity/UidRangeUtilsTest.java
View File

@@ -402,4 +402,27 @@ public class UidRangeUtilsTest {
expected.add(uids20_24);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
}
@Test
public void testSortRangesByStartUid() throws Exception {
final UidRange uid1 = new UidRange(100, 110);
final UidRange uid2 = new UidRange(120, 130);
final UidRange[] unsortedRanges = new UidRange[] {uid2, uid1};
final UidRange[] sortedRanges = UidRangeUtils.sortRangesByStartUid(unsortedRanges);
assertEquals(uid1, sortedRanges[0]);
assertEquals(uid2, sortedRanges[1]);
}
@Test
public void testSortedRangesContainOverlap() throws Exception {
final UidRange uid1 = new UidRange(100, 110);
final UidRange uid2 = new UidRange(109, 120);
final UidRange uid3 = new UidRange(120, 130);
final UidRange[] overlapRanges1 = new UidRange[] {uid1, uid2};
final UidRange[] overlapRanges2 = new UidRange[] {uid2, uid3};
final UidRange[] notOverlapRanges = new UidRange[] {uid1, uid3};
assertTrue(UidRangeUtils.sortedRangesContainOverlap(overlapRanges1));
assertTrue(UidRangeUtils.sortedRangesContainOverlap(overlapRanges2));
assertFalse(UidRangeUtils.sortedRangesContainOverlap(notOverlapRanges));
}
}