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

Commit 3cbfbc8e authored by xutianguo's avatar xutianguo Committed by android-build-merger
Browse files

Merge "Set sJniAdapterServiceObj to NULL after deleting it." 

am: 63cf40f9

Change-Id: I125f5bf9d8ce6ab00fadeb9261f478df8c5c7646
parents e3dd5fbd 63cf40f9

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+15 −4
Original line number Original line Diff line number Diff line
@@ -691,10 +691,21 @@ static bool cleanupNative(JNIEnv* env, jobject obj) { 
  sBluetoothInterface->cleanup();

  sBluetoothInterface->cleanup();

  ALOGI("%s: return from cleanup", __func__);

  ALOGI("%s: return from cleanup", __func__);





  if (sJniCallbacksObj) {

    env->DeleteGlobalRef(sJniCallbacksObj);

    env->DeleteGlobalRef(sJniCallbacksObj);

    sJniCallbacksObj = NULL;

  }



  if (sJniAdapterServiceObj) {

    env->DeleteGlobalRef(sJniAdapterServiceObj);

    env->DeleteGlobalRef(sJniAdapterServiceObj);

    sJniAdapterServiceObj = NULL;

  }



  if (android_bluetooth_UidTraffic.clazz) {

    env->DeleteGlobalRef(android_bluetooth_UidTraffic.clazz);

    env->DeleteGlobalRef(android_bluetooth_UidTraffic.clazz);

    android_bluetooth_UidTraffic.clazz = NULL;

    android_bluetooth_UidTraffic.clazz = NULL;

  }



  return JNI_TRUE;

  return JNI_TRUE;

}

}