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

Commit 39192c4e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "getTrustAgentConfiguration replace hasAdminComponent"

parents b0ec95ce b08bd6f3

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