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

Commit 3060967a authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

Merge "Acquire lock before calling getDeviceOwnerAdminLocked" into pi-dev am: b9ab72bf 

am: fc9dd7c6

Change-Id: I08f626298bd0d58cfa55b3e731e08eb22242e181
parents 1c23dc0a fc9dd7c6

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -5526,11 +5526,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        // If there is a profile owner, redirect to that; otherwise query the device owner.

        // If there is a profile owner, redirect to that; otherwise query the device owner.

        ComponentName aliasChooser = getProfileOwner(caller.getIdentifier());

        ComponentName aliasChooser = getProfileOwner(caller.getIdentifier());

        if (aliasChooser == null && caller.isSystem()) {

        if (aliasChooser == null && caller.isSystem()) {

            ActiveAdmin deviceOwnerAdmin = getDeviceOwnerAdminLocked();

            synchronized (getLockObject()) {

                final ActiveAdmin deviceOwnerAdmin = getDeviceOwnerAdminLocked();

                if (deviceOwnerAdmin != null) {

                if (deviceOwnerAdmin != null) {

                    aliasChooser = deviceOwnerAdmin.info.getComponent();

                    aliasChooser = deviceOwnerAdmin.info.getComponent();

                }

                }

            }

            }

        }

        if (aliasChooser == null) {

        if (aliasChooser == null) {

            sendPrivateKeyAliasResponse(null, response);

            sendPrivateKeyAliasResponse(null, response);

            return;

            return;