summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-15 04:29:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-15 04:29:37 +0000
commitbb076de2014bafe7f97b64f34802613359ea62f8 (patch)
treeda7841cf7cf807cd7329aa4b2db8e9db0f094760
parentf04f7e06c05c289490b29317cd42e457e32e1b41 (diff)
parentb0394a14a0280d184b53bb6355b4f1a1c6df2cc5 (diff)
Merge "Fix navigation input consumer not working when first window is invisible" am: 0a2c4f34c9 am: 1f03dce40c am: 72098d8cb2 am: b0394a14a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426652 Change-Id: I06ce9a0b23f4db854a38daf2f447c156ca8d1656
-rw-r--r--services/core/java/com/android/server/wm/InputMonitor.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 0216db471843..a70f98e07972 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;
}