diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java b/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java index bd9713b457331..8cd12621595dd 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java @@ -15,6 +15,7 @@ import android.view.InputDevice; import android.view.KeyEvent; import android.view.MotionEvent; +import android.view.PointerIcon; import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -360,6 +361,16 @@ public void onSensorChanged(SensorEvent event) { } } + // Prevent android internal NullPointerException (https://github.com/libsdl-org/SDL/issues/13306) + @Override + public PointerIcon onResolvePointerIcon(MotionEvent event, int pointerIndex) { + try { + return super.onResolvePointerIcon(event, pointerIndex); + } catch (NullPointerException e) { + return null; + } + } + // Captured pointer events for API 26. @Override public boolean onCapturedPointerEvent(MotionEvent event)