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

am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev

Browse Source 
* commit '5d5ee54ee25cadca06afb7ebf738bc88b7d20d9a':
  Invalid active window if temporary disabling accessibility for test tools.
This commit is contained in:
Svetoslav
2014-09-26 01:36:21 +00:00
committed by Android Git Automerger
parent 0f129c7959 54b0a05b00
commit 479eb79985
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

@@ -759,7 +759,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
}
int getActiveWindowId() {
return mSecurityPolicy.mActiveWindowId;
return mSecurityPolicy.getActiveWindowId();
}
void onTouchInteractionStart() {
@@ -2823,7 +2823,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private int resolveAccessibilityWindowIdLocked(int accessibilityWindowId) {
if (accessibilityWindowId == AccessibilityNodeInfo.ACTIVE_WINDOW_ID) {
return mSecurityPolicy.mActiveWindowId;
return mSecurityPolicy.getActiveWindowId();
}
return accessibilityWindowId;
}
@@ -3284,7 +3284,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
public void clearWindowsLocked() {
List<AccessibilityWindowInfo> windows = Collections.emptyList();
final int activeWindowId = mActiveWindowId;
updateWindowsLocked(windows);
mActiveWindowId = activeWindowId;
mWindows = null;
}
@@ -3497,6 +3499,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
}
}
public int getActiveWindowId() {
if (mActiveWindowId == INVALID_WINDOW_ID && !mTouchInteractionInProgress) {
mActiveWindowId = getFocusedWindowId();
}
return mActiveWindowId;
}
private void setActiveWindowLocked(int windowId) {
if (mActiveWindowId != windowId) {
mActiveWindowId = windowId;