From 781ccd4b253b2df0d9d479c5bf1fcb0a30158234 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Wed, 20 Apr 2022 10:50:16 -0700
Subject: [PATCH] Reset display input properties when removed

Bug: 227352703
Test: atest CtsHardwareTestCases:android.hardware.input.cts.tests.VirtualMouseTest --iterations 10
  and adb shell dumpsys input | grep mAdditionalDisplayInputProperties
  returns nothing

Change-Id: I4b8ca7f52079260eb9bf4cc8c69d88713087d6ac
---
 .../java/com/android/server/input/InputManagerService.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index e433324b152df..16aad01a6d315 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -1702,6 +1702,13 @@ public class InputManagerService extends IInputManager.Stub
             mPointerIconDisplayContext = null;
         }
 
+        synchronized (mAdditionalDisplayInputPropertiesLock) {
+            setPointerIconVisible(AdditionalDisplayInputProperties.DEFAULT_POINTER_ICON_VISIBLE,
+                    displayId);
+            setPointerAcceleration(AdditionalDisplayInputProperties.DEFAULT_POINTER_ACCELERATION,
+                    displayId);
+        }
+
         mNative.displayRemoved(displayId);
     }