Merge "Behave if the same view gets a11y focus twice." into nyc-mr1-dev

2016-07-14 01:25:04 +00:00
parent ec2ea47ead 0aaf427550
commit 93d51af336
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3173,7 +3173,7 @@ public final class ViewRootImpl implements ViewParent,
            }
            focusNode.recycle();
        }
-        if (mAccessibilityFocusedHost != null) {
+        if ((mAccessibilityFocusedHost != null) && (mAccessibilityFocusedHost != view))  {
            // Clear accessibility focus in the view.
            mAccessibilityFocusedHost.clearAccessibilityFocusNoCallbacks(
                    AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);