AI 144392: am: CL 144241 Stop polling dbus. (28d139fa) · Commits · e / os / android_frameworks_base

core/java/android/server/BluetoothEventLoop.java

+13 −43

Original line number	Original line	Diff line number	Diff line
	@@ -111,57 +111,27 @@ class BluetoothEventLoop {
	return mPasskeyAgentRequestData;		return mPasskeyAgentRequestData;
	}		}

	private synchronized boolean waitForAndDispatchEvent(int timeout_ms) {		private native void startEventLoopNative();
	return waitForAndDispatchEventNative(timeout_ms);		private native void stopEventLoopNative();
	}		private native boolean isEventLoopRunningNative();
	private native boolean waitForAndDispatchEventNative(int timeout_ms);

	/* package */ synchronized void start() {		/* package */ void start() {

	if (mThread != null) {		if (!isEventLoopRunningNative()) {
	// Already running.
	return;
	}
	mThread = new Thread("Bluetooth Event Loop") {
	@Override
	public void run() {
	try {
	if (setUpEventLoopNative()) {
	mStarted = true;
	while (!mInterrupted) {
	waitForAndDispatchEvent(0);
	sleep(500);
	}
	}
	// tear down even in the error case to clean
	// up anything we started to setup
	tearDownEventLoopNative();
	} catch (InterruptedException e) { }
	if (DBG) log("Event Loop thread finished");
	mThread = null;
	}
	};
	if (DBG) log("Starting Event Loop thread");		if (DBG) log("Starting Event Loop thread");
	mInterrupted = false;		startEventLoopNative();
	mThread.start();
	}		}
	private native boolean setUpEventLoopNative();
	private native void tearDownEventLoopNative();

	public synchronized void stop() {
	if (mThread != null) {
	mInterrupted = true;
	try {
	mThread.join();
	mThread = null;
	} catch (InterruptedException e) {
	Log.i(TAG, "Interrupted waiting for Event Loop thread to join");
	}		}

			public void stop() {
			if (isEventLoopRunningNative()) {
			if (DBG) log("Stopping Event Loop thread");
			stopEventLoopNative();
	}		}
	}		}

	public synchronized boolean isEventLoopRunning() {		public boolean isEventLoopRunning() {
	return mThread != null && mStarted;		return isEventLoopRunningNative();
	}		}

	/package/ void onModeChanged(String bluezMode) {		/package/ void onModeChanged(String bluezMode) {

core/jni/android_bluetooth_common.cpp

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -46,8 +46,9 @@ jfieldID get_field(JNIEnv env, jclass clazz, const char member,
	}		}

	typedef struct {		typedef struct {
	void (user_cb)(DBusMessage , void *);		void (user_cb)(DBusMessage , void , void );
	void *user;		void *user;
			void *nat;
	JNIEnv *env;		JNIEnv *env;
	} dbus_async_call_t;		} dbus_async_call_t;

	@@ -63,7 +64,7 @@ void dbus_func_args_async_callback(DBusPendingCall call, void data) {
	if (msg) {		if (msg) {
	if (req->user_cb) {		if (req->user_cb) {
	// The user may not deref the message object.		// The user may not deref the message object.
	req->user_cb(msg, req->user);		req->user_cb(msg, req->user, req->nat);
	}		}
	dbus_message_unref(msg);		dbus_message_unref(msg);
	}		}
	@@ -74,11 +75,14 @@ void dbus_func_args_async_callback(DBusPendingCall call, void data) {
	free(req);		free(req);
	}		}

	dbus_bool_t dbus_func_args_async_valist(JNIEnv *env,		static dbus_bool_t dbus_func_args_async_valist(JNIEnv *env,
	DBusConnection *conn,		DBusConnection *conn,
	int timeout_ms,		int timeout_ms,
	void (user_cb)(DBusMessage , void *),		void (user_cb)(DBusMessage ,
			void *,
			void*),
	void *user,		void *user,
			void *nat,
	const char *path,		const char *path,
	const char *ifc,		const char *ifc,
	const char *func,		const char *func,
	@@ -111,6 +115,7 @@ dbus_bool_t dbus_func_args_async_valist(JNIEnv *env,
	pending->env = env;		pending->env = env;
	pending->user_cb = user_cb;		pending->user_cb = user_cb;
	pending->user = user;		pending->user = user;
			pending->nat = nat;
	//pending->method = msg;		//pending->method = msg;

	reply = dbus_connection_send_with_reply(conn, msg,		reply = dbus_connection_send_with_reply(conn, msg,
	@@ -132,8 +137,9 @@ done:
	dbus_bool_t dbus_func_args_async(JNIEnv *env,		dbus_bool_t dbus_func_args_async(JNIEnv *env,
	DBusConnection *conn,		DBusConnection *conn,
	int timeout_ms,		int timeout_ms,
	void (reply)(DBusMessage , void *),		void (reply)(DBusMessage , void , void),
	void *user,		void *user,
			void *nat,
	const char *path,		const char *path,
	const char *ifc,		const char *ifc,
	const char *func,		const char *func,
	@@ -144,7 +150,7 @@ dbus_bool_t dbus_func_args_async(JNIEnv *env,
	va_start(lst, first_arg_type);		va_start(lst, first_arg_type);
	ret = dbus_func_args_async_valist(env, conn,		ret = dbus_func_args_async_valist(env, conn,
	timeout_ms,		timeout_ms,
	reply, user,		reply, user, nat,
	path, ifc, func,		path, ifc, func,
	first_arg_type, lst);		first_arg_type, lst);
	va_end(lst);		va_end(lst);

core/jni/android_bluetooth_common.h

+25 −16

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,9 @@
	#include "utils/Log.h"		#include "utils/Log.h"

	#include <errno.h>		#include <errno.h>
			#include <pthread.h>
	#include <stdint.h>		#include <stdint.h>
			#include <sys/poll.h>

	#ifdef HAVE_BLUETOOTH		#ifdef HAVE_BLUETOOTH
	#include <dbus/dbus.h>		#include <dbus/dbus.h>
	@@ -45,6 +47,9 @@ namespace android {

	#define BTADDR_SIZE 18 // size of BT address character array (including null)		#define BTADDR_SIZE 18 // size of BT address character array (including null)

			// size of the dbus event loops pollfd structure, hopefully never to be grown
			#define DEFAULT_INITIAL_POLLFD_COUNT 8

	jfieldID get_field(JNIEnv *env,		jfieldID get_field(JNIEnv *env,
	jclass clazz,		jclass clazz,
	const char *member,		const char *member,
	@@ -63,29 +68,33 @@ jfieldID get_field(JNIEnv *env,

	struct event_loop_native_data_t {		struct event_loop_native_data_t {
	DBusConnection *conn;		DBusConnection *conn;
	/* These variables are set in waitForAndDispatchEventNative() and are
	valid only within the scope of this function. At any other time, they		/* protects the thread */
	are NULL. */		pthread_mutex_t thread_mutex;
			pthread_t thread;
			/* our comms socket */
			/* mem for the list of sockets to listen to */
			struct pollfd *pollData;
			int pollMemberCount;
			int pollDataSize;
			/* mem for matching set of dbus watch ptrs */
			DBusWatch **watchData;
			/* pair of sockets for event loop control, Reader and Writer */
			int controlFdR;
			int controlFdW;
			/* our vm and env Version for future env generation */
			JavaVM *vm;
			int envVer;
			/* reference to our java self */
	jobject me;		jobject me;
	JNIEnv *env;
	};		};

	dbus_bool_t dbus_func_args_async_valist(JNIEnv *env,
	DBusConnection *conn,
	int timeout_ms,
	void (reply)(DBusMessage , void *),
	void *user,
	const char *path,
	const char *ifc,
	const char *func,
	int first_arg_type,
	va_list args);

	dbus_bool_t dbus_func_args_async(JNIEnv *env,		dbus_bool_t dbus_func_args_async(JNIEnv *env,
	DBusConnection *conn,		DBusConnection *conn,
	int timeout_ms,		int timeout_ms,
	void (reply)(DBusMessage , void *),		void (reply)(DBusMessage , void , void ),
	void *user,		void *user,
			void *nat,
	const char *path,		const char *path,
	const char *ifc,		const char *ifc,
	const char *func,		const char *func,

core/jni/android_server_BluetoothA2dpService.cpp

+10 −9

Original line number	Original line	Diff line number	Diff line
	@@ -52,12 +52,11 @@ typedef struct {

	static native_data_t *nat = NULL; // global native data		static native_data_t *nat = NULL; // global native data

	extern event_loop_native_data_t *event_loop_nat; // for the event loop JNIEnv
	#endif		#endif

	#ifdef HAVE_BLUETOOTH		#ifdef HAVE_BLUETOOTH
	static void onConnectSinkResult(DBusMessage msg, void user);		static void onConnectSinkResult(DBusMessage msg, void user, void *nat);
	static void onDisconnectSinkResult(DBusMessage msg, void user);		static void onDisconnectSinkResult(DBusMessage msg, void user, void *nat);
	#endif		#endif

	/* Returns true on success (even if adapter is present but disabled).		/* Returns true on success (even if adapter is present but disabled).
	@@ -175,7 +174,8 @@ static jboolean connectSinkNative(JNIEnv *env, jobject object, jstring path) {

	bool ret =		bool ret =
	dbus_func_args_async(env, nat->conn, -1,		dbus_func_args_async(env, nat->conn, -1,
	onConnectSinkResult, (void *)c_path_copy, c_path,		onConnectSinkResult, (void *)c_path_copy, nat,
			c_path,
	"org.bluez.audio.Sink", "Connect",		"org.bluez.audio.Sink", "Connect",
	DBUS_TYPE_INVALID);		DBUS_TYPE_INVALID);

	@@ -202,7 +202,8 @@ static jboolean disconnectSinkNative(JNIEnv *env, jobject object,

	bool ret =		bool ret =
	dbus_func_args_async(env, nat->conn, -1,		dbus_func_args_async(env, nat->conn, -1,
	onDisconnectSinkResult, (void *)c_path_copy, c_path,		onDisconnectSinkResult, (void *)c_path_copy, nat,
			c_path,
	"org.bluez.audio.Sink", "Disconnect",		"org.bluez.audio.Sink", "Disconnect",
	DBUS_TYPE_INVALID);		DBUS_TYPE_INVALID);
	env->ReleaseStringUTFChars(path, c_path);		env->ReleaseStringUTFChars(path, c_path);
	@@ -233,13 +234,13 @@ static jboolean isSinkConnectedNative(JNIEnv *env, jobject object, jstring path)
	}		}

	#ifdef HAVE_BLUETOOTH		#ifdef HAVE_BLUETOOTH
	static void onConnectSinkResult(DBusMessage msg, void user) {		static void onConnectSinkResult(DBusMessage msg, void user, void *natData) {
	LOGV(__FUNCTION__);		LOGV(__FUNCTION__);

	char c_path = (char )user;		char c_path = (char )user;
	DBusError err;		DBusError err;
	dbus_error_init(&err);		dbus_error_init(&err);
	JNIEnv *env = event_loop_nat->env;		JNIEnv *env = nat->env;

	LOGV("... path = %s", c_path);		LOGV("... path = %s", c_path);
	if (dbus_set_error_from_message(&err, msg)) {		if (dbus_set_error_from_message(&err, msg)) {
	@@ -258,13 +259,13 @@ static void onConnectSinkResult(DBusMessage msg, void user) {
	free(c_path);		free(c_path);
	}		}

	static void onDisconnectSinkResult(DBusMessage msg, void user) {		static void onDisconnectSinkResult(DBusMessage msg, void user, void *natData) {
	LOGV(__FUNCTION__);		LOGV(__FUNCTION__);

	char c_path = (char )user;		char c_path = (char )user;
	DBusError err;		DBusError err;
	dbus_error_init(&err);		dbus_error_init(&err);
	JNIEnv *env = event_loop_nat->env;		JNIEnv *env = nat->env;

	LOGV("... path = %s", c_path);		LOGV("... path = %s", c_path);
	if (dbus_set_error_from_message(&err, msg)) {		if (dbus_set_error_from_message(&err, msg)) {

core/jni/android_server_BluetoothDeviceService.cpp

+19 −5

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ namespace android {
	// We initialize these variables when we load class		// We initialize these variables when we load class
	// android.server.BluetoothDeviceService		// android.server.BluetoothDeviceService
	static jfieldID field_mNativeData;		static jfieldID field_mNativeData;
			static jfieldID field_mEventLoop;

	typedef struct {		typedef struct {
	JNIEnv *env;		JNIEnv *env;
	@@ -57,8 +58,10 @@ typedef struct {
	const char *adapter; // dbus object name of the local adapter		const char *adapter; // dbus object name of the local adapter
	} native_data_t;		} native_data_t;

	void onCreateBondingResult(DBusMessage msg, void user);		extern event_loop_native_data_t get_EventLoop_native_data(JNIEnv ,
	void onGetRemoteServiceChannelResult(DBusMessage msg, void user);		jobject);
			void onCreateBondingResult(DBusMessage msg, void user, void *nat);
			void onGetRemoteServiceChannelResult(DBusMessage msg, void user, void *nat);

	/** Get native data stored in the opaque (Java code maintained) pointer mNativeData		/** Get native data stored in the opaque (Java code maintained) pointer mNativeData
	* Perform quick sanity check, if there are any problems return NULL		* Perform quick sanity check, if there are any problems return NULL
	@@ -78,6 +81,8 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
	LOGV(__FUNCTION__);		LOGV(__FUNCTION__);
	#ifdef HAVE_BLUETOOTH		#ifdef HAVE_BLUETOOTH
	field_mNativeData = get_field(env, clazz, "mNativeData", "I");		field_mNativeData = get_field(env, clazz, "mNativeData", "I");
			field_mEventLoop = get_field(env, clazz, "mEventLoop",
			"Landroid/server/BluetoothEventLoop;");
	#endif		#endif
	}		}

	@@ -472,14 +477,19 @@ static jboolean createBondingNative(JNIEnv *env, jobject object,
	LOGV(__FUNCTION__);		LOGV(__FUNCTION__);
	#ifdef HAVE_BLUETOOTH		#ifdef HAVE_BLUETOOTH
	native_data_t *nat = get_native_data(env, object);		native_data_t *nat = get_native_data(env, object);
	if (nat) {		jobject eventLoop = env->GetObjectField(object, field_mEventLoop);
			struct event_loop_native_data_t *eventLoopNat =
			get_EventLoop_native_data(env, eventLoop);

			if (nat && eventLoopNat) {
	const char *c_address = env->GetStringUTFChars(address, NULL);		const char *c_address = env->GetStringUTFChars(address, NULL);
	LOGV("... address = %s", c_address);		LOGV("... address = %s", c_address);
	char context_address = (char )calloc(BTADDR_SIZE, sizeof(char));		char context_address = (char )calloc(BTADDR_SIZE, sizeof(char));
	strlcpy(context_address, c_address, BTADDR_SIZE); // for callback		strlcpy(context_address, c_address, BTADDR_SIZE); // for callback
	bool ret = dbus_func_args_async(env, nat->conn, (int)timeout_ms,		bool ret = dbus_func_args_async(env, nat->conn, (int)timeout_ms,
	onCreateBondingResult, // callback		onCreateBondingResult, // callback
	context_address, // user data		context_address,
			eventLoopNat,
	nat->adapter,		nat->adapter,
	DBUS_CLASS_NAME, "CreateBonding",		DBUS_CLASS_NAME, "CreateBonding",
	DBUS_TYPE_STRING, &c_address,		DBUS_TYPE_STRING, &c_address,
	@@ -856,7 +866,10 @@ static jboolean getRemoteServiceChannelNative(JNIEnv *env, jobject object,
	#ifdef HAVE_BLUETOOTH		#ifdef HAVE_BLUETOOTH
	LOGV(__FUNCTION__);		LOGV(__FUNCTION__);
	native_data_t *nat = get_native_data(env, object);		native_data_t *nat = get_native_data(env, object);
	if (nat) {		jobject eventLoop = env->GetObjectField(object, field_mEventLoop);
			struct event_loop_native_data_t *eventLoopNat =
			get_EventLoop_native_data(env, eventLoop);
			if (nat && eventLoopNat) {
	const char *c_address = env->GetStringUTFChars(address, NULL);		const char *c_address = env->GetStringUTFChars(address, NULL);
	char context_address = (char )calloc(BTADDR_SIZE, sizeof(char));		char context_address = (char )calloc(BTADDR_SIZE, sizeof(char));
	strlcpy(context_address, c_address, BTADDR_SIZE);		strlcpy(context_address, c_address, BTADDR_SIZE);
	@@ -866,6 +879,7 @@ static jboolean getRemoteServiceChannelNative(JNIEnv *env, jobject object,

	bool ret = dbus_func_args_async(env, nat->conn, 20000, // ms		bool ret = dbus_func_args_async(env, nat->conn, 20000, // ms
	onGetRemoteServiceChannelResult, context_address,		onGetRemoteServiceChannelResult, context_address,
			eventLoopNat,
	nat->adapter,		nat->adapter,
	DBUS_CLASS_NAME, "GetRemoteServiceChannel",		DBUS_CLASS_NAME, "GetRemoteServiceChannel",
	DBUS_TYPE_STRING, &c_address,		DBUS_TYPE_STRING, &c_address,