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

Commit 5a98f95f authored by Martin Brabham's avatar Martin Brabham Committed by Automerger Merge Worker
Browse files

Merge "OOB: Set correct byte arrays with data" am: 72381471 am: afdae4c1 am: b9cb6780 

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

Change-Id: Iaf40362ef2e617e88645f44beafee0ff01cad811
parents 0919ddb2 b9cb6780

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -412,11 +412,11 @@ static jobject createClassicOobDataObject(JNIEnv* env, bt_oob_data_t oob_data) { 
                          reinterpret_cast<jbyte*>(oob_data.c));



  jbyteArray oobDataLength = env->NewByteArray(OOB_DATA_LEN_SIZE);

  env->SetByteArrayRegion(confirmationHash, 0, OOB_DATA_LEN_SIZE,

  env->SetByteArrayRegion(oobDataLength, 0, OOB_DATA_LEN_SIZE,

                          reinterpret_cast<jbyte*>(oob_data.oob_data_length));



  jbyteArray address = env->NewByteArray(OOB_ADDRESS_SIZE);

  env->SetByteArrayRegion(confirmationHash, 0, OOB_ADDRESS_SIZE,

  env->SetByteArrayRegion(address, 0, OOB_ADDRESS_SIZE,

                          reinterpret_cast<jbyte*>(oob_data.address));



  jmethodID classicBuilderConstructor =
@@ -452,7 +452,7 @@ static jobject createLeOobDataObject(JNIEnv* env, bt_oob_data_t oob_data) { 
                          reinterpret_cast<jbyte*>(oob_data.c));



  jbyteArray address = env->NewByteArray(OOB_ADDRESS_SIZE);

  env->SetByteArrayRegion(confirmationHash, 0, OOB_ADDRESS_SIZE,

  env->SetByteArrayRegion(address, 0, OOB_ADDRESS_SIZE,

                          reinterpret_cast<jbyte*>(oob_data.address));



  jint le_role = (jint)oob_data.le_device_role;