From cfd6c85d4203ca2530ddff048654b365b346eefd Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Fri, 17 Mar 2017 12:39:15 -0700
Subject: [PATCH] Revert "Changing initial and default focus behavior"

This is a soft revert.

This reverts commit 37df2dbab124452e04bf14784df9ab5c2f64e434

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

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 3e56a3a32795f..61a06b2ee0d4b 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -463,7 +463,7 @@ public final class ViewRootImpl implements ViewParent,
         mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
 
         if (!sCompatibilityDone) {
-            sAlwaysAssignFocus = mTargetSdkVersion < Build.VERSION_CODES.O;
+            sAlwaysAssignFocus = true;
 
             sCompatibilityDone = true;
         }