Merge "Revert^2 "InputManagerService: fix requireNonNull failure messages"" into main (3f53cad6) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1230,7 +1230,7 @@ public class InputManagerService extends IInputManager.Stub
	"registerTabletModeChangedListener()")) {		"registerTabletModeChangedListener()")) {
	throw new SecurityException("Requires TABLET_MODE_LISTENER permission");		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) {		synchronized (mTabletModeLock) {
	final int callingPid = Binder.getCallingPid();		final int callingPid = Binder.getCallingPid();
	@@ -1342,7 +1342,7 @@ public class InputManagerService extends IInputManager.Stub

	@Override		@Override
	public void requestPointerCapture(IBinder inputChannelToken, boolean enabled) {		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);		mNative.requestPointerCapture(inputChannelToken, enabled);
	}		}