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

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

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

Merge "Allow device owner to configure preferential network service" into tm-dev am: 47a78f3d am: f8f95fef

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



Change-Id: Ia383f92de523f087962412831ce7b62ac75ae1a2
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43d70759 f8f95fef

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

+8 −1
Original line number Diff line number Diff line
@@ -8515,6 +8515,13 @@ 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()










@@ -18260,7 +18267,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























    private void updateNetworkPreferenceForUser(int userId,















            List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs) {













        if (!isManagedProfile(userId)) {













        if (!isManagedProfile(userId) && !isDeviceOwnerUserId(userId)) {















            return;















        }















        List<ProfileNetworkPreference> preferences = new ArrayList<>();