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

Commit 30826bd6 authored by Eran Messeri's avatar Eran Messeri Committed by android-build-merger
Browse files

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev 

am: 07a48574

Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6
parents 51fee974 07a48574

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

+1 −0
Original line number Diff line number Diff line
@@ -7798,6 +7798,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (!mHasFeature) {

            return null;

        }

        enforceManageUsers();

        synchronized (this) {

            List<String> result = null;

            // If we have multiple profiles we return the intersection of the