Merge "Set sJniAdapterServiceObj to NULL after deleting it." (eb9b8a92) · Commits · e / os / android_packages_apps_Bluetooth

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;
	}		}