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

Commit 070acaa9 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: Id535d9ad51ce517411a87dbbb0bce16f4aa33e22
parents 46577196 8e052e35

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

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









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









        }







        }











        return true;







        return true;











    }







    }











    }






























    @Override







    @Override











    public boolean hasDeviceOwner() {







    public boolean hasDeviceOwner() {