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

Commit 32e2d483 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: ff8f90b7

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



Change-Id: I728c51dd4994f56bb813cd16e00d320ac55e1ac7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb8035f8 ff8f90b7

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

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










@@ -18261,7 +18268,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<>();