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

Commit f2d89ed9 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Fix potential NPE" 

am: 845e492c

Change-Id: Ic1c1ec2f98bf4cb3676094be69765d484d42465f
parents 60bca627 845e492c

android/app/jni/com_android_bluetooth_gatt.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1563,10 +1563,11 @@ static void gattServerAddServiceNative(JNIEnv* env, jobject object, 


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

    ScopedLocalRef<jobject> uuid(env, env->GetObjectField(element.get(), fid));



    if (uuid.get() != NULL) {

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

      jlong uuid_lsb = env->CallLongMethod(uuid.get(), uuidGetLsb);

      set_uuid(curr.uuid.uu, uuid_msb, uuid_lsb);

    }



    fid = env->GetFieldID(gattDbElementClazz, "type", "I");

    curr.type =