Merge "Provide a timeout for SurfaceControl" into rvc-dev am: 6b9d875d27 am: 91a37222c3

Change-Id: I55511b95f618926d4cf272d6bd900ecbbda0a267
2020-05-04 17:06:54 +00:00
parent 24ea942f02 91a37222c3
commit 3fae4c49c5
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8051,7 +8051,7 @@ public class WindowManagerService extends IWindowManager.Stub
                | LayoutParams.FLAG_SLIPPERY);
        h.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | sanitizedFlags;
        h.layoutParamsType = 0;
-        h.dispatchingTimeoutNanos = -1;
+        h.dispatchingTimeoutNanos = DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;
        h.canReceiveKeys = false;
        h.hasFocus = false;
        h.hasWallpaper = false;