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

Commit d29687a0 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3697 

* changes:
  Disable bluetooth functions for SDK and Simulator.
parents 0d24e9b5 82aea4ab

core/jni/android_server_BluetoothA2dpService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ static jboolean disconnectSinkNative(JNIEnv *env, jobject object, 
    return JNI_FALSE;

}



DBusHandlerResult a2dp_event_filter(DBusMessage *msg, JNIEnv *env) {

#ifdef HAVE_BLUETOOTH

DBusHandlerResult a2dp_event_filter(DBusMessage *msg, JNIEnv *env) {

    DBusError err;



    if (!nat) {

core/jni/android_server_BluetoothDeviceService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -118,12 +118,16 @@ static bool initializeNativeDataNative(JNIEnv* env, jobject object) { 
}



static const char *get_adapter_path(JNIEnv* env, jobject object) {

#ifdef HAVE_BLUETOOTH

    event_loop_native_data_t *event_nat =

        get_EventLoop_native_data(env, env->GetObjectField(object,

                                                           field_mEventLoop));

    if (event_nat == NULL)

        return NULL;

    return event_nat->adapter;

#else

    return NULL;

#endif

}



// This function is called when the adapter is enabled.