diff options
| author | 2010-12-13 14:04:45 -0800 | |
|---|---|---|
| committer | 2010-12-13 14:05:30 -0800 | |
| commit | aecb2c5f709d38a46cf448f986b60f590651d3fa (patch) | |
| tree | f56f8621a78fbf3990ebf5e9a0a228216718daf9 | |
| parent | 595ca7062e81125723af5b2fdec2ba7277a00a11 (diff) | |
Remove function when Bluetooth is not present in the hardware.
Change-Id: I3892044723402597b7db1f7df683c08804c1fb96
| -rw-r--r-- | core/jni/android_server_BluetoothService.cpp | 5 |
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) { |