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

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

Merge changes from topic... 

Merge changes from topic "presubmit-am-fb2ad2dd2c90444796b6fcab87178f40-sc-v2-dev" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix lock held error when setting DO for AAOS 2p: 6bbbf704
  Fix lock held error when setting DO for AAOS
parents c3753255 d036f658

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