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

Commit 7a9aac5f authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "JNI: Check if service name is null in createSocketChannelNative" am:... 

Merge "JNI: Check if service name is null in createSocketChannelNative" am: 79c51c6a am: 170b993c
am: ee06c2da

Change-Id: I5f8a4af39628fe9a77540442ad4b3d18372871c4
parents 19b8a8e5 ee06c2da

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,9 @@ static jint createSocketChannelNative(JNIEnv* env, jobject obj, jint type, 
    goto done;

  }

  uuidBytes = env->GetByteArrayElements(uuid, nullptr);

  if (serviceName != nullptr) {

    nativeServiceName = env->GetStringUTFChars(serviceName, nullptr);

  }

  if (uuidBytes == nullptr) {

    jniThrowIOException(env, EINVAL);

    goto done;