commit 5ed52516c4de314c52dc076e83e98768791d90ef
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 29 17:05:36 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 29 17:05:36 2023 +0000
tree be26c92a0ecd12a2cf341ff3d1fc8d9af755218a
parent 5358dba9c4e706bba899ea003602919336d99db4
parent f509803cad6652c79871bb0a7b509ba2d1054b67

Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into main

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
index f3a540b..cd83f8f 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
@@ -389,11 +389,19 @@
     @Override
     public void onMotionEvent(MotionEvent transformedEvent, MotionEvent rawEvent,
             int policyFlags) {
+        if (!mInstalled) {
+            Slog.w(TAG, "onMotionEvent called before input filter installed!");
+            return;
+        }
         sendInputEvent(transformedEvent, policyFlags);
     }
 
     @Override
     public void onKeyEvent(KeyEvent event, int policyFlags) {
+        if (!mInstalled) {
+            Slog.w(TAG, "onKeyEvent called before input filter installed!");
+            return;
+        }
         sendInputEvent(event, policyFlags);
     }