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

Commit a8e9fdeb 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 sc-v2-dev

parents 2a9d5a42 6bbbf704

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

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

                    admin.getPackageName(), userId, "set-device-owner");

















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







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














        }



























        if (setProfileOwnerOnCurrentUserIfNecessary







        if (setProfileOwnerOnCurrentUserIfNecessary











                && mInjector.userManagerIsHeadlessSystemUserMode()) {







                && mInjector.userManagerIsHeadlessSystemUserMode()) {











                int currentForegroundUser = getCurrentForegroundUserId();







            int currentForegroundUser;














            synchronized (getLockObject()) {














                currentForegroundUser = getCurrentForegroundUserId();














            }











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







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











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







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











            // Sets profile owner on current foreground user since







            // Sets profile owner on current foreground user since









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









        }







        }











        return true;







        return true;











    }







    }











    }






























    @Override







    @Override











    public boolean hasDeviceOwner() {







    public boolean hasDeviceOwner() {