Merge "Enabled state shouldn't effect children."

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index e28522292ac3..03c3dedb688a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14003,7 +14003,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 // setFlags invocation.
                 shouldNotifyFocusableAvailable = true;
             } else {
-                if (hasFocus()) clearFocus();
+                if (isFocused()) clearFocus();
             }
         }