commit 07d9c3beb0c80963fa417b21d48fe9bdb59e44ef
author Harry Cutts <hcutts@google.com> Fri Mar 14 05:16:24 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 14 05:16:24 2025 -0700
tree e39100b1564e22bf18f16bf3443a22f80083f1ce
parent a749304d77d8ebe19f08aa322530dfbb72a17cd9

Revert^2 "InputManagerService: fix requireNonNull failure messages"

This reverts commit a749304d77d8ebe19f08aa322530dfbb72a17cd9.

Reason for revert: This is obviously unrelated to the failure from b/403394359.

Test: $ atest CtsAppTestCases:android.app.cts.DownloadManagerTest#testDownloadManagerSupportsHttpsWithExternalWebServer
Bug: 403394359
Change-Id: Ia10e48ac3b04a422d845af04734171fa4283039d

services/core/java/com/android/server/input/InputManagerService.java

diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index d9db178..6e6d00d 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -1230,7 +1230,7 @@
                 "registerTabletModeChangedListener()")) {
             throw new SecurityException("Requires TABLET_MODE_LISTENER permission");
         }
-        Objects.requireNonNull(listener, "event must not be null");
+        Objects.requireNonNull(listener, "listener must not be null");
 
         synchronized (mTabletModeLock) {
             final int callingPid = Binder.getCallingPid();
@@ -1342,7 +1342,7 @@
 
     @Override
     public void requestPointerCapture(IBinder inputChannelToken, boolean enabled) {
-        Objects.requireNonNull(inputChannelToken, "event must not be null");
+        Objects.requireNonNull(inputChannelToken, "inputChannelToken must not be null");
 
         mNative.requestPointerCapture(inputChannelToken, enabled);
     }