From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 23 Oct 2013 11:32:03 +0000 (+0300)
Subject: android: Add convenience variable for adapter bdaddr
X-Git-Tag: android-x86-4.4-r3~7203
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=16102bea3d82d6af666787c75751cd371109225b;p=android-x86%2Fexternal-bluetooth-bluez.git

android: Add convenience variable for adapter bdaddr
---

diff --git a/android/main.c b/android/main.c
index edcca731b..57b9bba44 100644
--- a/android/main.c
+++ b/android/main.c
@@ -72,6 +72,7 @@ static bool services[HAL_SERVICE_ID_MAX + 1] = { false };
 static void service_register(void *buf, uint16_t len)
 {
 	struct hal_msg_cmd_register_module *m = buf;
+	const bdaddr_t *adapter_bdaddr = bt_adapter_get_address();
 
 	if (m->service_id > HAL_SERVICE_ID_MAX || services[m->service_id])
 		goto error;
@@ -83,13 +84,12 @@ static void service_register(void *buf, uint16_t len)
 
 		break;
 	case HAL_SERVICE_ID_SOCK:
-		if (!bt_socket_register(hal_notif_io,
-						bt_adapter_get_address()))
+		if (!bt_socket_register(hal_notif_io, adapter_bdaddr))
 			goto error;
 
 		break;
 	case HAL_SERVICE_ID_HIDHOST:
-		if (!bt_hid_register(hal_notif_io, bt_adapter_get_address()))
+		if (!bt_hid_register(hal_notif_io, adapter_bdaddr))
 			goto error;
 
 		break;