Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd8ac5ce authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Gerrit Code Review
Browse files

Merge "Use int array for included and excluded uids"

parents c02e97dc 39558844

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −8
Original line number Diff line number Diff line
@@ -17845,14 +17845,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            } else {

                preferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_DEFAULT);

            }

            List<Integer> allowedUids = Arrays.stream(

                    preferentialNetworkServiceConfig.getIncludedUids()).boxed().collect(

                    Collectors.toList());

            List<Integer> excludedUids = Arrays.stream(

                    preferentialNetworkServiceConfig.getExcludedUids()).boxed().collect(

                    Collectors.toList());

            preferenceBuilder.setIncludedUids(allowedUids);

            preferenceBuilder.setExcludedUids(excludedUids);

            preferenceBuilder.setIncludedUids(preferentialNetworkServiceConfig.getIncludedUids());

            preferenceBuilder.setExcludedUids(preferentialNetworkServiceConfig.getExcludedUids());

            preferenceBuilder.setPreferenceEnterpriseId(

                    preferentialNetworkServiceConfig.getNetworkId());

























services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java



+2
−8




























Original line number
Diff line number
Diff line








@@ -4240,14 +4240,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {













        dpm.setPreferentialNetworkServiceConfigs(List.of(preferentialNetworkServiceConfigEnabled));















        assertThat(dpm.getPreferentialNetworkServiceConfigs().get(0)















                .isEnabled()).isTrue();













        List<Integer> includedList = new ArrayList<>();













        includedList.add(1);













        includedList.add(2);















        ProfileNetworkPreference preferenceDetails =















                new ProfileNetworkPreference.Builder()















                        .setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK)















                        .setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1)













                        .setIncludedUids(includedList)













                        .setIncludedUids(new int[]{1, 2})















                        .build();















        List<ProfileNetworkPreference> preferences = new ArrayList<>();















        preferences.add(preferenceDetails);










@@ -4275,14 +4272,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {













        dpm.setPreferentialNetworkServiceConfigs(List.of(preferentialNetworkServiceConfigEnabled));















        assertThat(dpm.getPreferentialNetworkServiceConfigs().get(0)















                .isEnabled()).isTrue();













        List<Integer> excludedUids = new ArrayList<>();













        excludedUids.add(1);













        excludedUids.add(2);















        ProfileNetworkPreference preferenceDetails =















                new ProfileNetworkPreference.Builder()















                        .setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK)















                        .setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1)













                        .setExcludedUids(excludedUids)













                        .setExcludedUids(new int[]{1, 2})















                        .build();















        List<ProfileNetworkPreference> preferences = new ArrayList<>();















        preferences.clear();