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" am: fd8ac5ce94 am: 591578331e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019627

Change-Id: I649ea11cb08cba9fdeaac61179626e19337b0078
This commit is contained in:
Sooraj Sasindran
2022-03-16 18:46:32 +00:00
committed by Automerger Merge Worker
parent c7d06c9e99 591578331e
commit 1e24104474
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

@@ -17877,14 +17877,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());

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));
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();