Tell DBUS not to call _exit() if the DBUS connection disconnects.
This was causing the system server to quietly die. Naughty DBUS!! Now you will just see errors in the log "DBUS connection disconnected" on every DBUS call. There is still the root cause problem of why the DBUS connection disconnects, which is not addressed by this change.
This commit is contained in:
@@ -53,6 +53,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) {
|
||||
LOGE("Could not get onto the system bus!");
|
||||
dbus_error_free(&err);
|
||||
}
|
||||
dbus_connection_set_exit_on_disconnect(conn, FALSE);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -84,6 +84,7 @@ static bool initNative(JNIEnv* env, jobject object) {
|
||||
dbus_error_free(&err);
|
||||
return false;
|
||||
}
|
||||
dbus_connection_set_exit_on_disconnect(nat->conn, FALSE);
|
||||
#endif /*HAVE_BLUETOOTH*/
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -109,6 +109,7 @@ static bool initializeNativeDataNative(JNIEnv* env, jobject object) {
|
||||
dbus_error_free(&err);
|
||||
return false;
|
||||
}
|
||||
dbus_connection_set_exit_on_disconnect(nat->conn, FALSE);
|
||||
|
||||
nat->adapter = BLUEZ_ADAPTER_OBJECT_NAME;
|
||||
#endif /*HAVE_BLUETOOTH*/
|
||||
|
||||
@@ -132,6 +132,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) {
|
||||
LOGE("%s: Could not get onto the system bus!", __FUNCTION__);
|
||||
dbus_error_free(&err);
|
||||
}
|
||||
dbus_connection_set_exit_on_disconnect(nat->conn, FALSE);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user