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

Commit c7704871 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Put getActiveAdminForCallerLocked call into synchronized block. 

Test: compiles
Bug: 147811995
Change-Id: I2e714dd685ad22b512ec127608c693d9ac95d3e6
parent eeb90fec

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

+5 −5
Original line number Diff line number Diff line
@@ -7859,12 +7859,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        if (!mHasFeature) {

            return false;

        }

        synchronized (getLockObject()) {

            if (parent) {

            ActiveAdmin ap = getActiveAdminForCallerLocked(who,

                final ActiveAdmin ap = getActiveAdminForCallerLocked(who,

                        DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA, parent);

                enforceProfileOwnerOfOrganizationOwnedDevice(ap);

            }

        synchronized (getLockObject()) {

            if (who != null) {

                ActiveAdmin admin = getActiveAdminUncheckedLocked(who, userHandle, parent);

                return (admin != null) ? admin.disableCamera : false;