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

Merge "Fix SecurityException when need permissions for AccessibilityServicesTest" into udc-dev

Browse Source
This commit is contained in:
Menghan Li
2023-03-20 13:53:01 +00:00
committed by Android (Google) Code Review
parent 4a3b5e4b1e ae70b96f0a
commit d4e306921e
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11780,22 +11780,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(canManageUsers(caller) || canQueryAdminPolicy(caller));
// Move AccessibilityManager out of lock to prevent potential deadlock
final List<AccessibilityServiceInfo> installedServices;
long id = mInjector.binderClearCallingIdentity();
try {
UserInfo user = getUserInfo(userId);
if (user.isManagedProfile()) {
userId = user.profileGroupId;
}
installedServices = withAccessibilityManager(userId,
AccessibilityManager::getInstalledAccessibilityServiceList);
} finally {
mInjector.binderRestoreCallingIdentity(id);
}
List<String> result = null;
synchronized (getLockObject()) {
List<String> result = null;
// If we have multiple profiles we return the intersection of the
// permitted lists. This can happen in cases where we have a device
// and profile owner.
@@ -11817,9 +11804,22 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
}
}
}
// If we have a permitted list add all system accessibility services.
if (result != null) {
long id = mInjector.binderClearCallingIdentity();
try {
UserInfo user = getUserInfo(userId);
if (user.isManagedProfile()) {
userId = user.profileGroupId;
}
// Move AccessibilityManager out of {@link getLockObject} to prevent potential
// deadlock.
final List<AccessibilityServiceInfo> installedServices =
withAccessibilityManager(userId,
AccessibilityManager::getInstalledAccessibilityServiceList);
// If we have a permitted list add all system accessibility services.
if (result != null) {
if (installedServices != null) {
for (AccessibilityServiceInfo service : installedServices) {
ServiceInfo serviceInfo = service.getResolveInfo().serviceInfo;
@@ -11829,10 +11829,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
}
}
} finally {
mInjector.binderRestoreCallingIdentity(id);
}
return result;
}
return result;
}
@Override