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

Commit 11dd7063 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Fix jni crash when get field of adType" am: 1d9ab0bb 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2455518



Change-Id: Ibc47640b1fabfc9ac3cac1965af941972f3ac53f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 349787d8 1d9ab0bb

android/app/jni/com_android_bluetooth_gatt.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1859,7 +1859,7 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject object, 




    curr.company_mask = env->GetIntField(current.get(), companyMaskFid);

    curr.company_mask = env->GetIntField(current.get(), companyMaskFid);





    curr.ad_type = env->GetByteField(current.get(), adTypeFid);

    curr.ad_type = env->GetIntField(current.get(), adTypeFid);





    ScopedLocalRef<jbyteArray> data(

    ScopedLocalRef<jbyteArray> data(

        env, (jbyteArray)env->GetObjectField(current.get(), dataFid));

        env, (jbyteArray)env->GetObjectField(current.get(), dataFid));