commit b1e2060975d380ea670f0df2c15a6a9e5e81365e
author Sooraj Sasindran <sasindran@google.com> Tue Apr 26 16:05:33 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 26 16:05:33 2022 +0000
tree 515c3bba10668b3714b5663d61decadcdbf65239
parent 9736fb2a2bc642c216f198eb4ac26cd3a3a0c05b
parent b579517aca640c386277a385598694c2db680872

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

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 2c4fa30b..e2d8a63 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8517,13 +8517,6 @@
         }
     }
 
-    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 @@
 
     private void updateNetworkPreferenceForUser(int userId,
             List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs) {
-        if (!isManagedProfile(userId) && !isDeviceOwnerUserId(userId)) {
+        if (!isManagedProfile(userId)) {
             return;
         }
         List<ProfileNetworkPreference> preferences = new ArrayList<>();