|
@@ -15,6 +15,7 @@ import android.view.Display;
|
|
import android.view.InputDevice;
|
|
import android.view.InputDevice;
|
|
import android.view.KeyEvent;
|
|
import android.view.KeyEvent;
|
|
import android.view.MotionEvent;
|
|
import android.view.MotionEvent;
|
|
|
|
+import android.view.PointerIcon;
|
|
import android.view.Surface;
|
|
import android.view.Surface;
|
|
import android.view.SurfaceHolder;
|
|
import android.view.SurfaceHolder;
|
|
import android.view.SurfaceView;
|
|
import android.view.SurfaceView;
|
|
@@ -360,6 +361,16 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 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.
|
|
// Captured pointer events for API 26.
|
|
@Override
|
|
@Override
|
|
public boolean onCapturedPointerEvent(MotionEvent event)
|
|
public boolean onCapturedPointerEvent(MotionEvent event)
|