Android: decouple JNI setup from unused subsystems #15895
+2,177
−2,059
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -467,22 +467,28 @@ public void onClick(DialogInterface dialog,int id) { | |
| mSingleton = this; | ||
| SDL.setContext(this); | ||
|
|
||
| if (SDL.isControllerManagerReady()) { | ||
| SDLControllerManager.initializeDeviceListener(); | ||
| } | ||
|
|
||
| if (SDL.isSubsystemInitialized(SDL.SDL_INIT_VIDEO)) { | ||
| mClipboardHandler = new SDLClipboardHandler(); | ||
| } | ||
|
|
||
| mHIDDeviceManager = HIDDeviceManager.acquire(this); | ||
|
|
||
| // Set up the surface | ||
| if (SDL.isSubsystemInitialized(SDL.SDL_INIT_VIDEO)) { | ||
| mSurface = createSDLSurface(this); | ||
|
|
||
| mLayout = new RelativeLayout(this); | ||
| mLayout.addView(mSurface); | ||
|
|
||
| // Get our current screen orientation and pass it down. | ||
| SDLActivity.nativeSetNaturalOrientation(SDLActivity.getNaturalOrientation()); | ||
| mCurrentRotation = SDLActivity.getCurrentRotation(); | ||
| SDLActivity.onNativeRotationChanged(mCurrentRotation); | ||
| } | ||
|
|
||
| try { | ||
| if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) { | ||
|
|
@@ -502,19 +508,22 @@ public void onClick(DialogInterface dialog,int id) { | |
| break; | ||
| } | ||
|
|
||
| if (mLayout != null) { | ||
| setContentView(mLayout); | ||
| setWindowStyle(false); | ||
| } | ||
|
|
||
| getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this); | ||
|
|
||
| // Get filename from "Open with" of another application | ||
| if (SDL.isSubsystemInitialized(SDL.SDL_INIT_VIDEO)) { | ||
| Intent intent = getIntent(); | ||
| if (intent != null && intent.getData() != null) { | ||
| String filename = intent.getData().getPath(); | ||
| if (filename != null) { | ||
| Log.v(TAG, "Got filename: " + filename); | ||
| SDLActivity.onNativeDropFile(filename); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -886,21 +895,27 @@ public static void handleNativeState() { | |
|
|
||
| // Try a transition to resumed state | ||
| if (mNextNativeState == NativeState.RESUMED) { | ||
| boolean readyToRun = (mSurface == null) ? mIsResumedCalled | ||
| : (mSurface.mIsSurfaceReady && (mHasFocus || mHasMultiWindow) && mIsResumedCalled); | ||
| if (readyToRun) { | ||
| if (mSDLThread == null) { | ||
| // This is the entry point to the C app. | ||
| // Start up the C app thread and enable sensor input for the first time | ||
| // FIXME: Why aren't we enabling sensor input at start? | ||
|
|
||
| mSDLThread = new Thread(new SDLMain(), "SDLThread"); | ||
| if (mSurface != null) { | ||
| mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true); | ||
| } | ||
| mSDLThread.start(); | ||
|
|
||
| // No nativeResume(), don't signal Android_ResumeSem | ||
| } else { | ||
| nativeResume(); | ||
| } | ||
| if (mSurface != null) { | ||
| mSurface.handleResume(); | ||
| } | ||
|
|
||
| mCurrentNativeState = mNextNativeState; | ||
| } | ||
|
|
@@ -1058,7 +1073,8 @@ protected boolean sendCommand(int command, Object data) { | |
| DisplayMetrics realMetrics = new DisplayMetrics(); | ||
| display.getRealMetrics(realMetrics); | ||
|
|
||
| boolean bFullscreenLayout = (mSurface != null) && | ||
| ((realMetrics.widthPixels == mSurface.getWidth()) && | ||
| (realMetrics.heightPixels == mSurface.getHeight())); | ||
|
|
||
| if ((Integer) data == 1) { | ||
|
|
@@ -1102,6 +1118,7 @@ protected boolean sendCommand(int command, Object data) { | |
| // C functions we call | ||
| public static native String nativeGetVersion(); | ||
| public static native void nativeSetupJNI(); | ||
| public static native int nativeGetCompiledSubsystems(); | ||
|
Collaborator
There was a problem hiding this comment. @HTRamsey, @AntTheAlchemist, do we need to do something with proguard here? |
||
| public static native void nativeInitMainThread(); | ||
| public static native void nativeCleanupMainThread(); | ||
| public static native int nativeRunMain(String library, String function, Object arguments); | ||
|
|
@@ -1553,7 +1570,7 @@ public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputC | |
| // Furthermore, it's possible a game controller has SOURCE_KEYBOARD and | ||
| // SOURCE_JOYSTICK, while its key events arrive from the keyboard source | ||
| // So, retrieve the device itself and check all of its sources | ||
| if (SDL.isControllerManagerReady() && SDLControllerManager.isDeviceSDLJoystick(device)) { | ||
| // Note that we process events with specific key codes here | ||
| if (event.getAction() == KeyEvent.ACTION_DOWN) { | ||
| if (SDLControllerManager.onNativePadDown(deviceId, keyCode, event.getScanCode())) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.