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

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

Merge "Set sJniAdapterServiceObj to NULL after deleting it." am: 63cf40f9 

am: 3cbfbc8e

Change-Id: Ib3fd3f766e693c6cd115c2de5270e486c0d39b86
parents 99c2c005 3cbfbc8e

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

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

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



  if (sJniCallbacksObj) {

    env->DeleteGlobalRef(sJniCallbacksObj);

    sJniCallbacksObj = NULL;

  }



  if (sJniAdapterServiceObj) {

    env->DeleteGlobalRef(sJniAdapterServiceObj);

    sJniAdapterServiceObj = NULL;

  }



  if (android_bluetooth_UidTraffic.clazz) {

    env->DeleteGlobalRef(android_bluetooth_UidTraffic.clazz);

    android_bluetooth_UidTraffic.clazz = NULL;

  }



  return JNI_TRUE;

}