Allow device owner to configure preferential network service

Bug: 226966328
Test: CTS
Change-Id: I8caddf5e47340ed51b287017e4d5ddf8113cfdaa
This commit is contained in:
Sooraj Sasindran
2022-04-20 21:30:11 -07:00
parent 5f50853cfb
commit 787dedce39

View File

@@ -8662,6 +8662,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
private boolean isDeviceOwnerUserId(int userId) {
synchronized (getLockObject()) {
return mOwners.hasDeviceOwner()
&& mOwners.getDeviceOwnerUserId() == userId;
}
}
private boolean isDeviceOwnerPackage(String packageName, int userId) {
synchronized (getLockObject()) {
return mOwners.hasDeviceOwner()
@@ -18394,7 +18401,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
private void updateNetworkPreferenceForUser(int userId,
List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs) {
if (!isManagedProfile(userId)) {
if (!isManagedProfile(userId) && !isDeviceOwnerUserId(userId)) {
return;
}
List<ProfileNetworkPreference> preferences = new ArrayList<>();