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

Commit f0355742 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Fix BT stack crashing on GATT discovery" am: b9caa2c9 

am: 9ea3626b

Change-Id: I11938be7cc7a6314d1cb345cf27d34aab6f05723
parents 91504c3c 9ea3626b

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ void fillGattDbElementArray(JNIEnv* env, jobject* array, 


    jobject uuid = env->NewObject(uuidClazz, uuidConstructor,

                                  uuid_msb(&curr.uuid), uuid_lsb(&curr.uuid));

    fid = env->GetFieldID(gattDbElementClazz, "uuid", "java/util/UUID");

    fid = env->GetFieldID(gattDbElementClazz, "uuid", "Ljava/util/UUID;");

    env->SetObjectField(element, fid, uuid);

    env->DeleteLocalRef(uuid);
@@ -1521,7 +1521,7 @@ static void gattServerAddServiceNative(JNIEnv* env, jobject object, 
    fid = env->GetFieldID(gattDbElementClazz, "id", "I");

    curr.id = env->GetIntField(element, fid);



    fid = env->GetFieldID(gattDbElementClazz, "uuid", "java/util/UUID");

    fid = env->GetFieldID(gattDbElementClazz, "uuid", "Ljava/util/UUID;");

    jobject uuid = env->GetObjectField(element, fid);



    jlong uuid_msb = env->CallLongMethod(uuid, uuidGetMsb);