Merge "Use client-side version of inTouchMode" into pi-dev

am: 3ec4b8ccfd Change-Id: If4fb112a4a8683dc99a5f82ee376b18c6323bf7c
2018-04-03 19:17:33 -07:00
parent 35fb9a9192 3ec4b8ccfd
commit bdc641a6d5
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3719,7 +3719,7 @@ public final class ViewRootImpl implements ViewParent,
        checkThread();
        if (mView != null) {
            if (!mView.hasFocus()) {
-                if (sAlwaysAssignFocus || !isInTouchMode()) {
+                if (sAlwaysAssignFocus || !mAttachInfo.mInTouchMode) {
                    v.requestFocus();
                }
            } else {