commit 3b388800b57b533260aabd9924f58a9180ae9ede
author Garfield Tan <xutan@google.com> Tue Jul 31 15:24:35 2018 -0700
committer Garfield Tan <xutan@google.com> Wed Aug 01 10:29:19 2018 -0700
tree 06d3235431af02da0cc064257bb18b865fc7646f
parent 2c43c9efd28ab61b384c706c97ea0a28558bd163

Fix 2 input issues.

1) Only register InputConsumer to default display;
2) Only use one input monitor for all displays.

Bug: 112049699
Bug: 112081256
Test: Manual. Launcher stopped crashing. Input works.
Change-Id: I87c5ad3f4c76055f4f164db48af6bd90f1e4339f

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index cea5f4c6..6286062 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -801,7 +801,9 @@
         // {@link DisplayContent} ready for use.
         mDisplayReady = true;
 
-        mInputMonitor = new InputMonitor(service, mDisplayId);
+        // TODO(b/112081256): Use independent InputMonitor.
+        mInputMonitor = isDefaultDisplay ? new InputMonitor(service, mDisplayId)
+                : mService.getDefaultDisplayContentLocked().mInputMonitor;
     }
 
     boolean isReady() {