From 7e5f3dbde70fedcc7a588efa67355f5c75c57b75 Mon Sep 17 00:00:00 2001 From: patricktu Date: Tue, 10 Aug 2021 09:10:35 +0800 Subject: [PATCH] Skip launching Assistant application when cancel the Meta up event Bug: 191497035 Test: Builds successfully and manually test Change-Id: Id24311daa1f677bbe3649c074a648c751d16cdca --- .../com/android/server/policy/PhoneWindowManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 75b66b3327a4b..2ac87a380fab2 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2798,9 +2798,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { mInputManagerInternal.toggleCapsLock(event.getDeviceId()); mPendingCapsLockToggle = false; } else if (mPendingMetaAction) { - launchAssistAction(Intent.EXTRA_ASSIST_INPUT_HINT_KEYBOARD, - event.getDeviceId(), - event.getEventTime(), AssistUtils.INVOCATION_TYPE_UNKNOWN); + if (!canceled) { + launchAssistAction(Intent.EXTRA_ASSIST_INPUT_HINT_KEYBOARD, + event.getDeviceId(), + event.getEventTime(), AssistUtils.INVOCATION_TYPE_UNKNOWN); + } mPendingMetaAction = false; } }