Merge "Set WindowSession's touchmode when in local focus mode,"
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 2db482d..1bb0311 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3589,9 +3589,7 @@
// tell the window manager
try {
- if (!isInLocalFocusMode()) {
- mWindowSession.setInTouchMode(inTouchMode);
- }
+ mWindowSession.setInTouchMode(inTouchMode);
} catch (RemoteException e) {
throw new RuntimeException(e);
}