summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/jni/android_server_BluetoothService.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp
index cd4d0292f054..b9ae526216fa 100644
--- a/core/jni/android_server_BluetoothService.cpp
+++ b/core/jni/android_server_BluetoothService.cpp
@@ -928,8 +928,8 @@ static jboolean discoverServicesNative(JNIEnv *env, jobject object,
return JNI_FALSE;
}
-static jintArray extract_handles(JNIEnv *env, DBusMessage *reply) {
#ifdef HAVE_BLUETOOTH
+static jintArray extract_handles(JNIEnv *env, DBusMessage *reply) {
jint *handles;
jintArray handleArray = NULL;
int len;
@@ -950,9 +950,8 @@ static jintArray extract_handles(JNIEnv *env, DBusMessage *reply) {
LOG_AND_FREE_DBUS_ERROR(&err);
}
return handleArray;
-#endif
- return NULL;
}
+#endif
static jintArray addReservedServiceRecordsNative(JNIEnv *env, jobject object,
jintArray uuids) {