Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use int array for included and excluded uids"

Browse Source
This commit is contained in:
Sooraj Sasindran
2022-03-16 17:56:08 +00:00
committed by Gerrit Code Review
parent c02e97dcdd 39558844fa
commit fd8ac5ce94
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -17845,14 +17845,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} else { } else {
preferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_DEFAULT); preferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_DEFAULT);
} }
List<Integer> allowedUids = Arrays.stream( preferenceBuilder.setIncludedUids(preferentialNetworkServiceConfig.getIncludedUids());
preferentialNetworkServiceConfig.getIncludedUids()).boxed().collect( preferenceBuilder.setExcludedUids(preferentialNetworkServiceConfig.getExcludedUids());
Collectors.toList());
List<Integer> excludedUids = Arrays.stream(
preferentialNetworkServiceConfig.getExcludedUids()).boxed().collect(
Collectors.toList());
preferenceBuilder.setIncludedUids(allowedUids);
preferenceBuilder.setExcludedUids(excludedUids);
preferenceBuilder.setPreferenceEnterpriseId( preferenceBuilder.setPreferenceEnterpriseId(
preferentialNetworkServiceConfig.getNetworkId()); preferentialNetworkServiceConfig.getNetworkId());

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

@@ -4240,14 +4240,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {
dpm.setPreferentialNetworkServiceConfigs(List.of(preferentialNetworkServiceConfigEnabled)); dpm.setPreferentialNetworkServiceConfigs(List.of(preferentialNetworkServiceConfigEnabled));
assertThat(dpm.getPreferentialNetworkServiceConfigs().get(0) assertThat(dpm.getPreferentialNetworkServiceConfigs().get(0)
.isEnabled()).isTrue(); .isEnabled()).isTrue();
List<Integer> includedList = new ArrayList<>();
includedList.add(1);
includedList.add(2);
ProfileNetworkPreference preferenceDetails = ProfileNetworkPreference preferenceDetails =
new ProfileNetworkPreference.Builder() new ProfileNetworkPreference.Builder()
.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK) .setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK)
.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1) .setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1)
.setIncludedUids(includedList) .setIncludedUids(new int[]{1, 2})
.build(); .build();
List<ProfileNetworkPreference> preferences = new ArrayList<>(); List<ProfileNetworkPreference> preferences = new ArrayList<>();
preferences.add(preferenceDetails); preferences.add(preferenceDetails);
@@ -4275,14 +4272,11 @@ public class DevicePolicyManagerTest extends DpmTestBase {
dpm.setPreferentialNetworkServiceConfigs(List.of(preferentialNetworkServiceConfigEnabled)); dpm.setPreferentialNetworkServiceConfigs(List.of(preferentialNetworkServiceConfigEnabled));
assertThat(dpm.getPreferentialNetworkServiceConfigs().get(0) assertThat(dpm.getPreferentialNetworkServiceConfigs().get(0)
.isEnabled()).isTrue(); .isEnabled()).isTrue();
List<Integer> excludedUids = new ArrayList<>();
excludedUids.add(1);
excludedUids.add(2);
ProfileNetworkPreference preferenceDetails = ProfileNetworkPreference preferenceDetails =
new ProfileNetworkPreference.Builder() new ProfileNetworkPreference.Builder()
.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK) .setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK)
.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1) .setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1)
.setExcludedUids(excludedUids) .setExcludedUids(new int[]{1, 2})
.build(); .build();
List<ProfileNetworkPreference> preferences = new ArrayList<>(); List<ProfileNetworkPreference> preferences = new ArrayList<>();
preferences.clear(); preferences.clear();