1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a2ecfc469182..b0ea3f167608 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -11253,6 +11253,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
 
         if (!isLayoutValid()) {
             mPrivateFlags |= PFLAG_WANTS_FOCUS;
+        } else {
+            clearParentsWantFocus();
         }
 
         handleFocusGainInternal(direction, previouslyFocusedRect);