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

Merge "Revert "Allow device owner to configure preferential network service"" into tm-dev am: b1e2060975

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

Change-Id: I6891e1e21961358b4aa419c65567928d9c520882
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sooraj Sasindran
2022-04-26 16:10:54 +00:00
committed by Automerger Merge Worker
parent bcfc2b3761 b1e2060975
commit 0df05f5e93
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8517,13 +8517,6 @@ 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()
@@ -18275,7 +18268,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
private void updateNetworkPreferenceForUser(int userId,
List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs) {
if (!isManagedProfile(userId) && !isDeviceOwnerUserId(userId)) {
if (!isManagedProfile(userId)) {
return;
}
List<ProfileNetworkPreference> preferences = new ArrayList<>();