public boolean cancelDiscovery() {
if (getState() != STATE_ON) return false;
try {
- mService.cancelDiscovery();
+ return mService.cancelDiscovery();
} catch (RemoteException e) {Log.e(TAG, "", e);}
return false;
}
#endif
}
-static void stopDiscoveryNative(JNIEnv *env, jobject object) {
- LOGV("%s", __FUNCTION__);
+static jboolean stopDiscoveryNative(JNIEnv *env, jobject object) {
+ LOGV(__FUNCTION__);
#ifdef HAVE_BLUETOOTH
DBusMessage *msg = NULL;
DBusMessage *reply = NULL;
DBusError err;
const char *name;
- jstring ret;
native_data_t *nat;
+ jboolean ret = JNI_FALSE;
dbus_error_init(&err);
} else {
LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg);
}
+ goto done;
}
+ ret = JNI_TRUE;
done:
if (msg) dbus_message_unref(msg);
if (reply) dbus_message_unref(reply);
+ return ret;
+#else
+ return JNI_FALSE;
#endif
}
BluetoothReceiver receiver = getBluetoothReceiver(mask);
long start = System.currentTimeMillis();
- // TODO: put assertTrue() around cancelDiscovery() once it starts returning true.
- adapter.cancelDiscovery();
+ assertTrue(adapter.cancelDiscovery());
while (System.currentTimeMillis() - start < START_STOP_SCAN_TIMEOUT) {
if (!adapter.isDiscovering() && ((receiver.getFiredFlags() & mask) == mask)) {