Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454bbcd8 authored by Nader Jawad's avatar Nader Jawad
Browse files

Fix JNI related crashing issues 

Updated JNI native code to include additional
jclass in method signature.

Bug: 202782306
Test: Builds and does not crash on launch

Change-Id: I0510ca79919ec06d88b39205d40bbe595c518b26
parent 13b1cbf5

tests/HwAccelerationTest/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 
        </activity>



        <activity android:name=".PenStylusActivity"

                  android:label="Pen (BUGGED)/Draw"

                  android:label="Pen/Draw"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

tests/HwAccelerationTest/jni/native-lib.cpp

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct MyWrapper { 
};



extern "C" JNIEXPORT jlong JNICALL

Java_com_android_test_hwui_FrontBufferedLayer_nCreate(JNIEnv* env, jobject jSurface) {

Java_com_android_test_hwui_FrontBufferedLayer_nCreate(JNIEnv* env, jclass, jobject jSurface) {

    ANativeWindow* window = ANativeWindow_fromSurface(env, jSurface);

    MyWrapper* wrapper = new MyWrapper(window);

    ANativeWindow_release(window);
@@ -49,13 +49,13 @@ Java_com_android_test_hwui_FrontBufferedLayer_nCreate(JNIEnv* env, jobject jSurf 
}



extern "C" JNIEXPORT void JNICALL

Java_com_android_test_hwui_FrontBufferedLayer_nDestroy(jlong ptr) {

Java_com_android_test_hwui_FrontBufferedLayer_nDestroy(JNIEnv*, jclass, jlong ptr) {

    MyWrapper* wrapper = reinterpret_cast<MyWrapper*>(ptr);

    delete wrapper;

}



extern "C" JNIEXPORT void JNICALL Java_com_android_test_hwui_FrontBufferedLayer_nUpdateBuffer(

        JNIEnv* env, jlong ptr, jobject jbuffer) {

        JNIEnv* env, jclass, jlong ptr, jobject jbuffer) {

    MyWrapper* wrapper = reinterpret_cast<MyWrapper*>(ptr);

    AHardwareBuffer* buffer = AHardwareBuffer_fromHardwareBuffer(env, jbuffer);

    wrapper->setBuffer(buffer);