From b579517aca640c386277a385598694c2db680872 Mon Sep 17 00:00:00 2001
From: Sooraj Sasindran <sasindran@google.com>
Date: Mon, 25 Apr 2022 18:48:20 +0000
Subject: [PATCH] Revert "Allow device owner to configure preferential network
 service"

This reverts commit 787dedce39017bb450b2ed75e9843bb7a3a1046c.

Reason for revert: b/230351564

Change-Id: Id32fdad0d4c31992ca739da681ef7273d6dd2705
---
 .../server/devicepolicy/DevicePolicyManagerService.java  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index d54a237f199af..35dbb157aaf45 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8662,13 +8662,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()
@@ -18401,7 +18394,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<>();