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

Commit 040e5bd0 authored by Yan Zhu's avatar Yan Zhu Committed by Automerger Merge Worker
Browse files

Merge "Fix lock held error when setting DO for AAOS" into tm-dev am: 8e052e35 

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

Change-Id: I97e9d451fd1ec1d5bd47b5a011ce777226bfb11f
parents 5a46ecc5 8e052e35

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() {