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

Use int array for included and excluded uids

Browse Source 
Use int array for included and excluded uids so that uses
same data type as in PreferentialNetworkServiceConfig

Bug: 217365439
Test: ran connectivity service unit tests
Change-Id: I9ac7e6498df2fd20b8397b2c110296e019c7389e
This commit is contained in:
Sooraj Sasindran
2022-03-09 21:59:00 -08:00
parent 8b7896b51a
commit 4904176454
7 changed files with 160 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -13868,12 +13868,13 @@ public class ConnectivityServiceTest {
ProfileNetworkPreference profileNetworkPreference) {
final Set<UidRange> uidRangeSet;
UidRange range = UidRange.createForUser(handle);
if (profileNetworkPreference.getIncludedUids().size() != 0) {
uidRangeSet = UidRangeUtils.convertListToUidRange(
if (profileNetworkPreference.getIncludedUids().length != 0) {
uidRangeSet = UidRangeUtils.convertArrayToUidRange(
profileNetworkPreference.getIncludedUids());
} else if (profileNetworkPreference.getExcludedUids().size() != 0) {
} else if (profileNetworkPreference.getExcludedUids().length != 0) {
uidRangeSet = UidRangeUtils.removeRangeSetFromUidRange(
range, UidRangeUtils.convertListToUidRange(
range, UidRangeUtils.convertArrayToUidRange(
profileNetworkPreference.getExcludedUids()));
} else {
uidRangeSet = new ArraySet<>();
@@ -14245,7 +14246,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
profileNetworkPreferenceBuilder.setIncludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID)});
registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false, testHandle,
@@ -14264,7 +14265,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
profileNetworkPreferenceBuilder.setIncludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false,
@@ -14283,7 +14284,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
profileNetworkPreferenceBuilder.setExcludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false,
@@ -14303,7 +14304,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
profileNetworkPreferenceBuilder.setExcludedUids(
List.of(testHandle.getUid(0) - 1));
new int[]{testHandle.getUid(0) - 1});
final TestOnCompleteListener listener = new TestOnCompleteListener();
Assert.assertThrows(IllegalArgumentException.class, () -> mCm.setProfileNetworkPreferences(
testHandle, List.of(profileNetworkPreferenceBuilder.build()),
@@ -14311,7 +14312,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setIncludedUids(
List.of(testHandle.getUid(0) - 1));
new int[]{testHandle.getUid(0) - 1});
Assert.assertThrows(IllegalArgumentException.class,
() -> mCm.setProfileNetworkPreferences(
testHandle, List.of(profileNetworkPreferenceBuilder.build()),
@@ -14320,9 +14321,9 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setIncludedUids(
List.of(testHandle.getUid(0) - 1));
new int[]{testHandle.getUid(0) - 1});
profileNetworkPreferenceBuilder.setExcludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
Assert.assertThrows(IllegalArgumentException.class,
() -> mCm.setProfileNetworkPreferences(
testHandle, List.of(profileNetworkPreferenceBuilder.build()),
@@ -14333,9 +14334,9 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder2.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder2.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
profileNetworkPreferenceBuilder2.setIncludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
profileNetworkPreferenceBuilder.setIncludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
Assert.assertThrows(IllegalArgumentException.class,
() -> mCm.setProfileNetworkPreferences(
testHandle, List.of(profileNetworkPreferenceBuilder.build(),
@@ -14344,9 +14345,9 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder2.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder2.setExcludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
profileNetworkPreferenceBuilder.setExcludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
Assert.assertThrows(IllegalArgumentException.class,
() -> mCm.setProfileNetworkPreferences(
testHandle, List.of(profileNetworkPreferenceBuilder.build(),
@@ -14356,9 +14357,9 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder2.setPreference(
PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK);
profileNetworkPreferenceBuilder2.setExcludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
profileNetworkPreferenceBuilder.setExcludedUids(
List.of(testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)));
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
Assert.assertThrows(IllegalArgumentException.class,
() -> mCm.setProfileNetworkPreferences(
testHandle, List.of(profileNetworkPreferenceBuilder.build(),

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

@@ -351,4 +351,55 @@ public class UidRangeUtilsTest {
expected.add(uids6);
assertEquals(expected, UidRangeUtils.convertListToUidRange(input));
}
@Test @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)
public void testConvertArrayToUidRange() {
final UidRange uids1_1 = new UidRange(1, 1);
final UidRange uids1_2 = new UidRange(1, 2);
final UidRange uids100_100 = new UidRange(100, 100);
final UidRange uids10_10 = new UidRange(10, 10);
final UidRange uids10_14 = new UidRange(10, 14);
final UidRange uids20_24 = new UidRange(20, 24);
final Set<UidRange> expected = new ArraySet<>();
int[] input = new int[0];
assertThrows(NullPointerException.class, () -> UidRangeUtils.convertArrayToUidRange(null));
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
input = new int[] {1};
expected.add(uids1_1);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
input = new int[]{1, 2};
expected.clear();
expected.add(uids1_2);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
input = new int[]{1, 100};
expected.clear();
expected.add(uids1_1);
expected.add(uids100_100);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
input = new int[]{100, 1};
expected.clear();
expected.add(uids1_1);
expected.add(uids100_100);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
input = new int[]{100, 1, 2, 1, 10};
expected.clear();
expected.add(uids1_2);
expected.add(uids10_10);
expected.add(uids100_100);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
input = new int[]{10, 11, 12, 13, 14, 20, 21, 22, 23, 24};
expected.clear();
expected.add(uids10_14);
expected.add(uids20_24);
assertEquals(expected, UidRangeUtils.convertArrayToUidRange(input));
}
}