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

Commit e499d3e6 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Revert "Allow device owner to configure preferential network service""... 

Merge "Revert "Allow device owner to configure preferential network service"" into tm-dev am: b1e20609 am: b2c84419 am: 691ffc68

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



Change-Id: I2c04900ea327f192b79f006a026d28bbc7883725
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adaa8ade 691ffc68

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

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