From 1416a9c4668d2f335642ab2b2e0a276527c649f5 Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Fri, 3 Sep 2021 04:31:30 -0700
Subject: Add null check in InputManagerService#verifyInputEvent

Using a null event can cause the system to crash.

Bug: 197961435
Fixes: 201720518
Test: Presubmit
Change-Id: Ibf4b44dbedc3b041f6e38362b862f1ab0f665726
(cherry picked from commit 38e3e2b6f6cad87ebbf21a25c42fc2193590fd7e)
---
 services/core/java/com/android/server/input/InputManagerService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index b0b8be2c9677..fae7e451b529 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -900,6 +900,7 @@ public class InputManagerService extends IInputManager.Stub
 
     @Override // Binder call
     public VerifiedInputEvent verifyInputEvent(InputEvent event) {
+        Objects.requireNonNull(event, "event must not be null");
         return nativeVerifyInputEvent(mPtr, event);
     }
 
-- 
cgit v1.2.3-59-g8ed1b