Showing the changes to android/libraries/oculus/src/main/java (1 of 6 files). Show all
Unified · Split
| @@ -7,6 +7,7 @@ · 6 unmodified lines | ||
| 7 | 7 | // |
| 8 | 8 | package io.highfidelity.oculus; |
| 9 | 9 | |
| 10 | +import android.content.res.AssetManager; | |
| 10 | 11 | import android.os.Bundle; |
| 11 | 12 | import android.util.Log; |
| 12 | 13 | import android.view.Surface; |
| @@ -24,7 +25,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca · 11 unmodified lines | ||
| 24 | 25 | private static final String TAG = OculusMobileActivity.class.getSimpleName(); |
| 25 | 26 | static { System.loadLibrary("oculusMobile"); } |
| 26 | 27 | |
| 27 | − private native void nativeOnCreate(); | |
| 28 | + private native void nativeOnCreate(AssetManager assetManager); | |
| 28 | 29 | private native static void nativeOnResume(); |
| 29 | 30 | private native static void nativeOnPause(); |
| 30 | 31 | private native static void nativeOnSurfaceChanged(Surface s); |
| @@ -53,7 +54,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca · 22 unmodified lines | ||
| 53 | 54 | mView = new SurfaceView(this); |
| 54 | 55 | mView.getHolder().addCallback(this); |
| 55 | 56 | |
| 56 | − nativeOnCreate(); | |
| 57 | + nativeOnCreate(getAssets()); | |
| 57 | 58 | questNativeOnCreate(); |
| 58 | 59 | } |
| 59 | 60 | |
| @@ -81,7 +82,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca · 21 unmodified lines | ||
| 81 | 82 | Log.w(TAG, "QQQ onResume"); |
| 82 | 83 | super.onResume(); |
| 83 | 84 | //Reconnect the global reference back to handler |
| 84 | − nativeOnCreate(); | |
| 85 | + nativeOnCreate(getAssets()); | |
| 85 | 86 | |
| 86 | 87 | questNativeOnResume(); |
| 87 | 88 | nativeOnResume(); |