From c1863f8887d0be4dc0802b993741904341d36766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosmin=20B=C4=83ie=C8=99?= Date: Wed, 19 Apr 2023 14:14:50 +0200 Subject: [PATCH] Add missing validation in IInputMethodWrapper The case handling DO_SET_STYLUS_WINDOW_IDLE_TIMEOUT was missing the validation check, which could lead to NullPointerExceptions. Test: n/a Bug: 278853086 Change-Id: I998e20df74b618396cfe3b1fa5d7d4e7d13e054c --- core/java/android/inputmethodservice/IInputMethodWrapper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index ed6a88f3693d0..70b72c8095248 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -304,7 +304,9 @@ class IInputMethodWrapper extends IInputMethod.Stub return; } case DO_SET_STYLUS_WINDOW_IDLE_TIMEOUT: { - inputMethod.setStylusWindowIdleTimeoutForTest((long) msg.obj); + if (isValid(inputMethod, target, "DO_SET_STYLUS_WINDOW_IDLE_TIMEOUT")) { + inputMethod.setStylusWindowIdleTimeoutForTest((long) msg.obj); + } return; } }