mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-21 01:57:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(InputDevice): Oculus controller getName nullptr crash

Browse Source 
Oculus controllers makes a motion event that doesn't have a device
attached to it. Weird but ok.
This commit is contained in:
alexytomi
2025-08-22 10:45:22 +08:00
parent 5befc690a1
commit 99546e033c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@@ -168,7 +168,9 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe
@Override
public boolean onGenericMotionEvent(MotionEvent event) {
Log.i(TAG, "onGenericMotionEvent: " + event.getDevice().getName() + ": " + "x: " + event.getAxisValue(MotionEvent.AXIS_X) + " | y: " + event.getAxisValue(MotionEvent.AXIS_Y) + " | " + event.getDeviceId());
try {
Log.i(TAG, "onGenericMotionEvent: " + event.getDevice().getName() + ": " + "x: " + event.getAxisValue(MotionEvent.AXIS_X) + " | y: " + event.getAxisValue(MotionEvent.AXIS_Y) + " | " + event.getDeviceId());
} catch (NullPointerException ignored){Logger.appendToLog(event.toString());}
try {
Class<?> sdlActivityClass = Class.forName("org.libsdl.app.SDLActivityComponent");
Method getMotionListener = sdlActivityClass.getDeclaredMethod("getMotionListener");
@@ -533,9 +535,10 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe
// Using this tends to not be reliable.
// This is part of androids shoving random garbage KeyEvents everywhere mitigation.
return true;
Log.i(TAG, "dispatchKeyEvent: " + event.getDevice().getName() + ": " + event.getAction() + " | " + event.getKeyCode()
try {
Log.i(TAG, "dispatchKeyEvent: " + event.getDevice().getName() + ": " + event.getAction() + " | " + event.getKeyCode()
+ " | " + event.getSource() + " | " + event.getScanCode() );
} catch (NullPointerException ignored) {Logger.appendToLog(event.toString());}
if (!sdlActivityComponent.dispatchKeyEvent(event)) return true;
SDLActivityComponent.handleKeyEvent(minecraftGLView, event.getKeyCode(), event, null);
return true;