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

Merge "fix package visibility for installed accessibility services" into sc-dev

Browse Source
This commit is contained in:
Ryan Lin
2021-06-23 01:13:13 +00:00
committed by Android (Google) Code Review
parent 1b1df33123 5170c58c86
commit d616f1ed95
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -872,19 +872,33 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
"userId=" + userId); "userId=" + userId);
} }
final int resolvedUserId;
final List<AccessibilityServiceInfo> serviceInfos;
synchronized (mLock) { synchronized (mLock) {
// We treat calls from a profile as if made by its parent as profiles // We treat calls from a profile as if made by its parent as profiles
// share the accessibility state of the parent. The call below // share the accessibility state of the parent. The call below
// performs the current profile parent resolution. // performs the current profile parent resolution.
final int resolvedUserId = mSecurityPolicy resolvedUserId = mSecurityPolicy
.resolveCallingUserIdEnforcingPermissionsLocked(userId); .resolveCallingUserIdEnforcingPermissionsLocked(userId);
serviceInfos = new ArrayList<>(
getUserStateLocked(resolvedUserId).mInstalledServices);
}
if (Binder.getCallingPid() == OWN_PROCESS_ID) { if (Binder.getCallingPid() == OWN_PROCESS_ID) {
return new ArrayList<>(getUserStateLocked(resolvedUserId).mInstalledServices); return serviceInfos;
} }
return getUserStateLocked(resolvedUserId).mInstalledServices; final PackageManagerInternal pm = LocalServices.getService(
PackageManagerInternal.class);
final int callingUid = Binder.getCallingUid();
for (int i = serviceInfos.size() - 1; i >= 0; i--) {
final AccessibilityServiceInfo serviceInfo = serviceInfos.get(i);
if (pm.filterAppAccess(serviceInfo.getComponentName().getPackageName(), callingUid,
resolvedUserId)) {
serviceInfos.remove(i);
} }
} }
return serviceInfos;
}
@Override @Override
public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int feedbackType, public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int feedbackType,