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 am: d616f1ed95

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

Change-Id: I859e0d4ef07de6283078f808c9765f384cdd886e
This commit is contained in:
Ryan Lin
2021-06-23 01:27:16 +00:00
committed by Automerger Merge Worker
parent e03cc1b4fe d616f1ed95
commit 5f48285bcf
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -880,18 +880,32 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
FLAGS_ACCESSIBILITY_MANAGER, "userId=" + userId); FLAGS_ACCESSIBILITY_MANAGER, "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<>(
if (Binder.getCallingPid() == OWN_PROCESS_ID) { getUserStateLocked(resolvedUserId).mInstalledServices);
return new ArrayList<>(getUserStateLocked(resolvedUserId).mInstalledServices);
}
return getUserStateLocked(resolvedUserId).mInstalledServices;
} }
if (Binder.getCallingPid() == OWN_PROCESS_ID) {
return serviceInfos;
}
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