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

Commit 19a9c764 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add termination nullptr to signify end of arg list" am: 9e5550d9 

Change-Id: Ic56fd5d80fb0744e8da06972eba0cfc24a5fb5b2
parents 18bf0224 9e5550d9

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,10 @@ static void dumpNative(JNIEnv* env, jobject obj, jobject fdObj, 


  jstring* argObjs = new jstring[numArgs];

  const char** args = nullptr;

  if (numArgs > 0) args = new const char*[numArgs];

  if (numArgs > 0) {

    args = new const char*[numArgs + 1];

    args[numArgs] = nullptr;

  }



  for (int i = 0; i < numArgs; i++) {

    argObjs[i] = (jstring)env->GetObjectArrayElement(argArray, i);