Merge change 3697
* changes:
Disable bluetooth functions for SDK and Simulator.
diff --git a/core/jni/android_server_BluetoothA2dpService.cpp b/core/jni/android_server_BluetoothA2dpService.cpp
index d85d8c1..153d16e 100644
--- a/core/jni/android_server_BluetoothA2dpService.cpp
+++ b/core/jni/android_server_BluetoothA2dpService.cpp
@@ -182,8 +182,8 @@
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) {
diff --git a/core/jni/android_server_BluetoothDeviceService.cpp b/core/jni/android_server_BluetoothDeviceService.cpp
index 4be4761..61b8a78 100644
--- a/core/jni/android_server_BluetoothDeviceService.cpp
+++ b/core/jni/android_server_BluetoothDeviceService.cpp
@@ -118,12 +118,16 @@
}
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.
