From 516b2cd4276615466b3915d63ba46ffc220a5740 Mon Sep 17 00:00:00 2001
From: Fabian Leutenegger <fabian.leutenegger@bluewin.ch>
Date: Wed, 9 Aug 2023 14:10:27 +0200
Subject: [PATCH] core: server: inputmanager: Check if input method is enabled
 before showing missing keyboard layout notification

Change-Id: Ia0ea7cc5af4cbd53dd948db61d95460bd89feabd
---
 .../java/com/android/server/input/InputManagerService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index e8067d248150..aaa28f0481e4 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -1070,7 +1070,8 @@ private void deliverInputDevicesChanged(InputDevice[] oldInputDevices) {
                 deviceIdAndGeneration[i * 2] = inputDevice.getId();
                 deviceIdAndGeneration[i * 2 + 1] = inputDevice.getGeneration();
 
-                if (!inputDevice.isVirtual() && inputDevice.isFullKeyboard()) {
+                if (!inputDevice.isVirtual() && inputDevice.isFullKeyboard()
+                        && isInputDeviceEnabled(inputDevice.getId())) {
                     if (!containsInputDeviceWithDescriptor(oldInputDevices,
                             inputDevice.getDescriptor())) {
                         mTempFullKeyboards.add(numFullKeyboardsAdded++, inputDevice);