Merge "Clear accessibility focus when view becomes invisible" into klp-dev

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 40db8b94895b..01da6b333d0e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8895,10 +8895,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
              */
             mPrivateFlags |= PFLAG_DRAWN;
 
-            if (((mViewFlags & VISIBILITY_MASK) == INVISIBLE) && hasFocus()) {
+            if (((mViewFlags & VISIBILITY_MASK) == INVISIBLE)) {
                 // root view becoming invisible shouldn't clear focus and accessibility focus
                 if (getRootView() != this) {
-                    clearFocus();
+                    if (hasFocus()) clearFocus();
                     clearAccessibilityFocus();
                 }
             }