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

Commit eae311c7 authored by Nick Pelly's avatar Nick Pelly
Browse files

resolved conflicts for merge of ed336839 to master

parents 130a8f8c ed336839

core/jni/android_server_BluetoothA2dpService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,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;

}

core/jni/android_server_BluetoothDeviceService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static bool initializeNativeDataNative(JNIEnv* env, jobject object) { 
        dbus_error_free(&err);

        return false;

    }

    dbus_connection_set_exit_on_disconnect(nat->conn, FALSE);

#endif  /*HAVE_BLUETOOTH*/

    return true;

}

core/jni/android_server_BluetoothEventLoop.cpp

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,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

}