resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp (6dd45316) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+1 −1

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -250,15 +250,15 @@ done:
		#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);

		@@ -288,11 +288,16 @@ static void stopDiscoveryNative(JNIEnv *env, jobject object) {
		} 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
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -678,8 +678,7 @@ public class BluetoothTestUtils extends Assert {
		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)) {