Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

Browse Source 
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
This commit is contained in:
Jaikumar Ganesh
2011-07-13 12:29:57 -07:00
parent 28d92afc0a ab3ec17608
commit 6dd4531639
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -699,7 +699,7 @@ public final class BluetoothAdapter {
public boolean cancelDiscovery() { public boolean cancelDiscovery() {
if (getState() != STATE_ON) return false; if (getState() != STATE_ON) return false;
try { try {
mService.cancelDiscovery(); return mService.cancelDiscovery();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
return false; return false;
} }

11
core/jni/android_server_BluetoothService.cpp
View File

@@ -250,15 +250,15 @@ done:
#endif #endif
} }
static void stopDiscoveryNative(JNIEnv *env, jobject object) { static jboolean stopDiscoveryNative(JNIEnv *env, jobject object) {
LOGV("%s", __FUNCTION__); LOGV(__FUNCTION__);
#ifdef HAVE_BLUETOOTH #ifdef HAVE_BLUETOOTH
DBusMessage *msg = NULL; DBusMessage *msg = NULL;
DBusMessage *reply = NULL; DBusMessage *reply = NULL;
DBusError err; DBusError err;
const char *name; const char *name;
jstring ret;
native_data_t *nat; native_data_t *nat;
jboolean ret = JNI_FALSE;
dbus_error_init(&err); dbus_error_init(&err);
@@ -288,11 +288,16 @@ static void stopDiscoveryNative(JNIEnv *env, jobject object) {
} else { } else {
LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg); LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg);
} }
goto done;
} }
ret = JNI_TRUE;
done: done:
if (msg) dbus_message_unref(msg); if (msg) dbus_message_unref(msg);
if (reply) dbus_message_unref(reply); if (reply) dbus_message_unref(reply);
return ret;
#else
return JNI_FALSE;
#endif #endif
} }

3
core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java
View File

@@ -678,8 +678,7 @@ public class BluetoothTestUtils extends Assert {
BluetoothReceiver receiver = getBluetoothReceiver(mask); BluetoothReceiver receiver = getBluetoothReceiver(mask);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
// TODO: put assertTrue() around cancelDiscovery() once it starts returning true. assertTrue(adapter.cancelDiscovery());
adapter.cancelDiscovery();
while (System.currentTimeMillis() - start < START_STOP_SCAN_TIMEOUT) { while (System.currentTimeMillis() - start < START_STOP_SCAN_TIMEOUT) {
if (!adapter.isDiscovering() && ((receiver.getFiredFlags() & mask) == mask)) { if (!adapter.isDiscovering() && ((receiver.getFiredFlags() & mask) == mask)) {