Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I97e9d451fd1ec1d5bd47b5a011ce777226bfb11f
This commit is contained in:
Yan Zhu
2022-03-01 18:53:58 +00:00
committed by Automerger Merge Worker
parent 5a46ecc515 8e052e35ea
commit 040e5bd07b
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

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