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

Merge "Acquire lock before calling getDeviceOwnerAdminLocked" into pi-dev

Browse Source 
am: b9ab72bf96

Change-Id: Id969235011d5d836b0f79640e07a2c5035b66fd8
This commit is contained in:
Pavel Grafov
2018-05-09 13:02:10 -07:00
committed by android-build-merger
parent 5c195ee292 b9ab72bf96
commit fc9dd7c67b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5525,9 +5525,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// If there is a profile owner, redirect to that; otherwise query the device owner. // If there is a profile owner, redirect to that; otherwise query the device owner.
ComponentName aliasChooser = getProfileOwner(caller.getIdentifier()); ComponentName aliasChooser = getProfileOwner(caller.getIdentifier());
if (aliasChooser == null && caller.isSystem()) { if (aliasChooser == null && caller.isSystem()) {
ActiveAdmin deviceOwnerAdmin = getDeviceOwnerAdminLocked(); synchronized (getLockObject()) {
if (deviceOwnerAdmin != null) { final ActiveAdmin deviceOwnerAdmin = getDeviceOwnerAdminLocked();
aliasChooser = deviceOwnerAdmin.info.getComponent(); if (deviceOwnerAdmin != null) {
aliasChooser = deviceOwnerAdmin.info.getComponent();
}
} }
} }
if (aliasChooser == null) { if (aliasChooser == null) {