commit 3f53cad68be6a25b75e60188813da51a22496db4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 14 08:41:21 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 14 08:41:21 2025 -0700
tree 10155955914063cb124eb649848bb61a337adef7
parent 5cb3c18a1be69d53a15793d71d639739bee93584
parent 07d9c3beb0c80963fa417b21d48fe9bdb59e44ef

Merge "Revert^2 "InputManagerService: fix requireNonNull failure messages"" into main

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);
     }