From 5148384ca3417b8e49b51e42b50a76a2938c6bba Mon Sep 17 00:00:00 2001
From: Yabin Huang <yabinh@google.com>
Date: Tue, 25 Apr 2023 23:05:13 +0000
Subject: [PATCH] Revert "Set VIEW_STATE_FOCUSED only if view and window has
 focus"

This reverts commit 6898584b743168a77d816f0a7938dcbd43c81291.

Reason for revert: causing b/250783866

Fixes: 250783866
Fixes: 260268425
Test: manual

Change-Id: I4cf3d5b302a5fe8a492455972f8764d293bcb471
---
 core/java/android/view/View.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 003307db832a5..7c9809702dfcd 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -25079,7 +25079,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         int viewStateIndex = 0;
         if ((privateFlags & PFLAG_PRESSED) != 0) viewStateIndex |= StateSet.VIEW_STATE_PRESSED;
         if ((mViewFlags & ENABLED_MASK) == ENABLED) viewStateIndex |= StateSet.VIEW_STATE_ENABLED;
-        if (isFocused() && hasWindowFocus()) viewStateIndex |= StateSet.VIEW_STATE_FOCUSED;
+        if (isFocused()) viewStateIndex |= StateSet.VIEW_STATE_FOCUSED;
         if ((privateFlags & PFLAG_SELECTED) != 0) viewStateIndex |= StateSet.VIEW_STATE_SELECTED;
         if (hasWindowFocus()) viewStateIndex |= StateSet.VIEW_STATE_WINDOW_FOCUSED;
         if ((privateFlags & PFLAG_ACTIVATED) != 0) viewStateIndex |= StateSet.VIEW_STATE_ACTIVATED;