From 941770b9c2d0e762f7a9703edf721e9b89ca1505 Mon Sep 17 00:00:00 2001 From: arthurhung Date: Tue, 8 Sep 2020 16:26:59 +0800 Subject: [PATCH] Fix navigation input consumer not working when first window is invisible The nav InputConsumer should be the top window without being related to some window or it may be hidden if the window is not visible. Test: atest com.android.server.wm Test: atest WindowInsetsControllerTests Bug: 167940326 Merged-In: I842114e68eaedaa008972a0a84c6b6394174f232 Change-Id: I842114e68eaedaa008972a0a84c6b6394174f232 (cherry picked from commit 74a9a609acf2a1be6a85a9ba8d3ff54470c28978) --- services/core/java/com/android/server/wm/InputMonitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index 0216db4718436..a70f98e079725 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -520,7 +520,8 @@ final class InputMonitor { } if (mAddNavInputConsumerHandle) { - mNavInputConsumer.show(mInputTransaction, w); + // We set the layer to z=MAX-1 so that it's always on top. + mNavInputConsumer.show(mInputTransaction, Integer.MAX_VALUE - 1); mAddNavInputConsumerHandle = false; }