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

Commit 6abe3d4d 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 tm-dev am: 47a78f3d 

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



Change-Id: I76ccb5ca2db19b16e6f4339fae013868078d1d72
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0908a1b 47a78f3d

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<>();