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

Merge "Using windowId from A11yWindowInfo instead"

Browse Source
This commit is contained in:
Lucy Chang
2020-10-14 03:26:34 +00:00
committed by Android (Google) Code Review
parent 829b71b0f1 12e1ea6a42
commit dc6aaed888
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -941,10 +941,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
if (resolvedUserId != mCurrentUserId) {
return null;
}
if (mA11yWindowManager.findA11yWindowInfoByIdLocked(windowId) == null) {
final AccessibilityWindowInfo accessibilityWindowInfo = mA11yWindowManager
.findA11yWindowInfoByIdLocked(windowId);
if (accessibilityWindowInfo == null) {
return null;
}
return mA11yWindowManager.getWindowTokenForUserAndWindowIdLocked(userId, windowId);
// We use AccessibilityWindowInfo#getId instead of windowId. When the windowId comes
// from an embedded hierarchy, the system can't find correct window token because
// embedded hierarchy doesn't have windowInfo. Calling
// AccessibilityWindowManager#findA11yWindowInfoByIdLocked can look for its parent's
// windowInfo, so it is safer to use AccessibilityWindowInfo#getId
// to get window token to find real window.
return mA11yWindowManager.getWindowTokenForUserAndWindowIdLocked(userId,
accessibilityWindowInfo.getId());
}
}