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

Commit b08bd6f3 authored by Alex Johnston's avatar Alex Johnston
Browse files

getTrustAgentConfiguration replace hasAdminComponent 

Bug: 171056125
Test: atest com.android.cts.devicepolicy.ManagedProfileTest#testTrustAgentInfo
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testTrustAgentInfo
Change-Id: Ia67c0f24ad7e667bb41a371ad4c142d423826806
parent e702085f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -8666,7 +8666,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
















        synchronized (getLockObject()) {







        synchronized (getLockObject()) {











            final String componentName = agent.flattenToString();







            final String componentName = agent.flattenToString();











            if (caller.hasAdminComponent()) {







            if (admin != null) {











                final ActiveAdmin ap = getActiveAdminUncheckedLocked(admin, userHandle, parent);







                final ActiveAdmin ap = getActiveAdminUncheckedLocked(admin, userHandle, parent);











                if (ap == null) return null;







                if (ap == null) return null;











                TrustAgentInfo trustAgentInfo = ap.trustAgentInfos.get(componentName);







                TrustAgentInfo trustAgentInfo = ap.trustAgentInfos.get(componentName);