commit 9628308adc509b2af1c35c3de8369e657055357a
author Siarhei Vishniakou <svv@google.com> Mon Aug 13 18:55:55 2018 +0000
committer Siarhei Vishniakou <svv@google.com> Mon Aug 13 18:55:55 2018 +0000
tree d307c0535e5b149062e685e84a051a019630c94e
parent b37e35e4a5576f89a39ff1f422b5c7f71ec3924d

Revert "Fix WM input limitations on secondary displays (2/N)"

This reverts commit b37e35e4a5576f89a39ff1f422b5c7f71ec3924d.

Reason for revert: null pointer dereference

Change-Id: I009aac84a5c3c4b40fab1c91519252a68272c103

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 44d0187..4ab06a2 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -814,7 +814,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() {
@@ -2132,7 +2134,6 @@
             mRemovingDisplay = false;
         }
 
-        mInputMonitor.onRemoved();
         mService.onDisplayRemoved(mDisplayId);
     }