diff options
| author | Sooraj Sasindran <sasindran@google.com> | 2022-03-16 17:56:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-16 17:56:08 +0000 |
| commit | 2ccbfe9d8f7bd4e66cd0a18ffe613a909573f640 (patch) | |
| tree | 9462b46a8ec4a9cc82db742de2792bf431f73c61 /tests/unit/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 6dde8ac532343da1529946978cef47c42f704613 (diff) | |
| parent | 4904176454386db52aee348d46057d6791fef5c8 (diff) | |
Merge "Use int array for included and excluded uids"
Diffstat (limited to 'tests/unit/java/com/android/server/ConnectivityServiceTest.java')
| -rw-r--r-- | tests/unit/java/com/android/server/ConnectivityServiceTest.java | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 94272b8518..0ee9e0bc73 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -13870,12 +13870,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<>(); @@ -14247,7 +14248,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, @@ -14266,7 +14267,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, @@ -14285,7 +14286,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, @@ -14305,7 +14306,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()), @@ -14313,7 +14314,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()), @@ -14322,9 +14323,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()), @@ -14335,9 +14336,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(), @@ -14346,9 +14347,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(), @@ -14358,9 +14359,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(), |