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

Commit 4e170f5c authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Fix an OOB bug in set_data" into tm-dev am: 125cf1ea am: 69962b50 am: a9d05181 

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



Change-Id: Ie6718013a6c955e573c0983dcc071d174c358c0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5fd17c7 a9d05181

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ static jboolean set_data(JNIEnv* env, bt_oob_data_t& oob_data, jobject oobData, 
    }



    oobDataLengthBytes = env->GetByteArrayElements(oobDataLength, NULL);

    memcpy(oob_data.oob_data_length, oobDataLengthBytes, len);

    memcpy(oob_data.oob_data_length, oobDataLengthBytes, OOB_DATA_LEN_SIZE);

    env->ReleaseByteArrayElements(oobDataLength, oobDataLengthBytes, 0);



    // Optional