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

Commit d89cac15 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 

am: 30826bd6

Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c
parents 19ad060b 30826bd6

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

+1 −0
Original line number Diff line number Diff line
@@ -7804,6 +7804,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