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

Commit d036f658 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Fix lock held error when setting DO for AAOS 2p: 6bbbf704 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17109244


Change-Id: I90f6f40ed285a7e1091ae4c1432f4ee872aacbf6
Merged-In: I7beef692f01e32e0724273d2f9773e051c81c331
parents de47f438 6bbbf704

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

+14 −11
Original line number Diff line number Diff line
@@ -8469,10 +8469,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                    admin.getPackageName(), userId, "set-device-owner");















            Slogf.i(LOG_TAG, "Device owner set: " + admin + " on user " + userId);













        }





























        if (setProfileOwnerOnCurrentUserIfNecessary















                && mInjector.userManagerIsHeadlessSystemUserMode()) {













                int currentForegroundUser = getCurrentForegroundUserId();













            int currentForegroundUser;













            synchronized (getLockObject()) {













                currentForegroundUser = getCurrentForegroundUserId();













            }















            Slogf.i(LOG_TAG, "setDeviceOwner(): setting " + admin















                    + " as profile owner on user " + currentForegroundUser);















            // Sets profile owner on current foreground user since









@@ -8483,7 +8487,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















        return true;















    }













    }





























    @Override















    public boolean hasDeviceOwner() {