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

Commit 2768a041 authored by Elis Elliott's avatar Elis Elliott
Browse files

Return copy of mEnforcingAdmin from getEnforcingAdminsOnUser 

Fixes: 339774909
Flag: EXEMPT bugfix
Test: btest a.d.c.DevicePolicyManagemetRoleHolderTest
Change-Id: I53964d6b936e8c7978da44d0e503af36ddf4f49f
parent 0d8a1648

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1553,7 +1553,7 @@ final class DevicePolicyEngine { 
    private Set<EnforcingAdmin> getEnforcingAdminsOnUser(int userId) {

    private Set<EnforcingAdmin> getEnforcingAdminsOnUser(int userId) {

        synchronized (mLock) {

        synchronized (mLock) {

            return mEnforcingAdmins.contains(userId)

            return mEnforcingAdmins.contains(userId)

                    ? mEnforcingAdmins.get(userId) : Collections.emptySet();

                    ? new HashSet<>(mEnforcingAdmins.get(userId)) : Collections.emptySet();

        }

        }

    }

    }