Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b579517a authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Revert "Allow device owner to configure preferential network service" 

This reverts commit 787dedce.

Reason for revert: b/230351564

Change-Id: Id32fdad0d4c31992ca739da681ef7273d6dd2705
parent 787dedce

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

+1 −8
Original line number Diff line number Diff line
@@ -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<>();