Accessibility focus not cleared on temporary detach.

1. There was a path for removing a view without clearing its accessibility focus.
   Then when we try to draw the focused rectangle we get an exception since the
   accessibility focused view is not attached to the view tree when computing
   the location of the rectangel to draw.

bug:7297191

Change-Id: I81e3c35e830e27cf95e73accb665629d0c456afb

1 files changed, 2 insertions, 0 deletions

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index db1c00aeccd2..726fa28f2ee3 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -3912,6 +3912,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * @see #removeDetachedView(View, boolean)
      */
     protected void detachViewFromParent(View child) {
+        child.clearAccessibilityFocus();
         removeFromArray(indexOfChild(child));
     }
 
@@ -3933,6 +3934,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * @see #removeDetachedView(View, boolean)
      */
     protected void detachViewFromParent(int index) {
+        getChildAt(index).clearAccessibilityFocus();
         removeFromArray(index);
     }