From b34cad00d374e09eed4df028dee5f82ea32a07d7 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Thu, 9 Nov 2017 19:25:24 +0000
Subject: Revert "Enable new initial-focus behavior for P"

This reverts commit 4dc3289c942398507a8b6240559da599d11a3284.

Reason for revert: Pushback from bundled apps.

Bug: 68841055
Bug: 34520588
Change-Id: Id771a11c9b44baf5810240cca164bae9f468b5ad
---
 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 e528839eb72d..415aad54ee78 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -512,7 +512,7 @@ public final class ViewRootImpl implements ViewParent,
         mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
 
         if (!sCompatibilityDone) {
-            sAlwaysAssignFocus = mTargetSdkVersion < Build.VERSION_CODES.P;
+            sAlwaysAssignFocus = true;
 
             sCompatibilityDone = true;
         }
-- 
cgit v1.2.3-59-g8ed1b