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

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

Browse Source 
* changes:
  [automerge] Fix lock held error when setting DO for AAOS 2p: 6bbbf704a0
  Fix lock held error when setting DO for AAOS
This commit is contained in:
Yan Zhu
2022-03-09 21:38:43 +00:00
committed by Android (Google) Code Review
parent c375325532 d036f658ac
commit 447bfd4ee4
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

@@ -8469,10 +8469,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
@@ -8483,7 +8487,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} }
return true; return true;
} }
}
@Override @Override
public boolean hasDeviceOwner() { public boolean hasDeviceOwner() {