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

Commit 1d2f1cad authored by zhenchao's avatar zhenchao Committed by Rongxuan Liu
Browse files

[le audio] remove the ending null bytes in native broadcast code 

While createBroadcast using broadcast code setting from UI, JNI
layer will add null bytes padding on MSB positions if code is shorter
than 16.

After broadcast is started successfully and prepare to notify UI via
onBroadcastMetadataChanged() callback, JNI layer need remove the
ending null bytes from the native broadcast code.

Bug: 301913633
Bug: 316005152
Test: manual
Test: atest LeAudioBroadcastServiceTest
Change-Id: I734110bb6f16c63e46ff44c91bc6b7eb29241b97
parent f4209007

android/app/jni/com_android_bluetooth_le_audio.cpp

+4 −7
Original line number Diff line number Diff line
@@ -1045,16 +1045,14 @@ jobject prepareBluetoothLeBroadcastMetadataObject( 
    return nullptr;

  }



  // Skip the leading null char bytes

  // Remove the ending null char bytes

  int nativeCodeSize = 16;

  int nativeCodeLeadingZeros = 0;

  if (broadcast_metadata.broadcast_code) {

    auto& nativeCode = broadcast_metadata.broadcast_code.value();

    nativeCodeLeadingZeros =

    nativeCodeSize =

        std::find_if(nativeCode.cbegin(), nativeCode.cend(),

                     [](int x) { return x != 0x00; }) -

                     [](int x) { return x == 0x00; }) -

        nativeCode.cbegin();

    nativeCodeSize = nativeCode.size() - nativeCodeLeadingZeros;

  }



  ScopedLocalRef<jbyteArray> code(env, env->NewByteArray(nativeCodeSize));
@@ -1066,8 +1064,7 @@ jobject prepareBluetoothLeBroadcastMetadataObject( 
  if (broadcast_metadata.broadcast_code) {

    env->SetByteArrayRegion(

        code.get(), 0, nativeCodeSize,

        (const jbyte*)broadcast_metadata.broadcast_code->data() +

            nativeCodeLeadingZeros);

        (const jbyte*)broadcast_metadata.broadcast_code->data());

    CHECK(!env->ExceptionCheck());

  }