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

Commit 8e052e35 authored by Yan Zhu's avatar Yan Zhu Committed by Android (Google) Code Review
Browse files

Merge "Fix lock held error when setting DO for AAOS" into tm-dev

parents ca67d533 335db53f

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

+14 −11
Original line number Diff line number Diff line
@@ -8610,10 +8610,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









@@ -8624,7 +8628,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















        return true;















    }













    }





























    @Override















    public boolean hasDeviceOwner() {