From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 19 Dec 2012 16:48:08 +0000 (+0100)
Subject: core: Ensure that adapter->discoverable default is false
X-Git-Tag: android-x86-4.4-r3~9459
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0cc2fb37f479ecdb2d10a23d526dbcff88ca9385;p=android-x86%2Fexternal-bluetooth-bluez.git

core: Ensure that adapter->discoverable default is false
---

diff --git a/src/adapter.c b/src/adapter.c
index 144975ce0..5539d55c6 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2601,7 +2601,12 @@ static void load_config(struct btd_adapter *adapter)
 
 	/* Get discoverable mode */
 	adapter->discoverable = g_key_file_get_boolean(key_file, "General",
-							"Discoverable", NULL);
+							"Discoverable", &gerr);
+	if (gerr) {
+		adapter->discoverable = FALSE;
+		g_error_free(gerr);
+		gerr = NULL;
+	}
 
 	/* Get discoverable timeout */
 	adapter->discov_timeout = g_key_file_get_integer(key_file, "General",