Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix JNI related crashing issues"

Browse Source
This commit is contained in:
Nader Jawad
2021-11-05 23:30:38 +00:00
committed by Android (Google) Code Review
parent 8f0480504f 454bbcd8e6
commit db866e75c0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/HwAccelerationTest/AndroidManifest.xml
View File

@@ -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"/>

6
tests/HwAccelerationTest/jni/native-lib.cpp
View File

@@ -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);