summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-02-20 04:36:47 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-20 04:36:47 -0800
commit28a5dd8e1c18c546a611148df201bfa229f510cb (patch)
treeefcac77b69aae45f57c6c70484ad71cde6a48c95 /services
parentdd0c640576d1eaebd852475e14624f7292188a9e (diff)
parentb5f396ac9c043e17d3b21519758615144e62f7ef (diff)
Merge "Cache w.canReceiveKeys()." into main am: e39d5212b2 am: b5f396ac9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3496493 Change-Id: I0ec2f56ef514786ef6149f6bd1c1d046983a73ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 85416903b274..13c47251b9af 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -822,11 +822,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
*/
private final ToBooleanFunction<WindowState> mFindFocusedWindow = w -> {
final ActivityRecord focusedApp = mFocusedApp;
+ final boolean canReceiveKeys = w.canReceiveKeys();
ProtoLog.v(WM_DEBUG_FOCUS, "Looking for focus: %s, flags=%d, canReceive=%b, reason=%s",
- w, w.mAttrs.flags, w.canReceiveKeys(),
+ w, w.mAttrs.flags, canReceiveKeys,
w.canReceiveKeysReason(false /* fromUserTouch */));
- if (!w.canReceiveKeys()) {
+ if (!canReceiveKeys) {
return false;
}