From: Seonah Moon <seonah1.moon@samsung.com>
Date: Thu, 23 Apr 2015 01:20:43 +0000 (+0900)
Subject: Add TIZEN_EXT patch to ignore rfkill block
X-Git-Tag: accepted/tizen/common/20150423.074131^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F14%2F38614%2F2;p=platform%2Fupstream%2Fconnman.git

Add TIZEN_EXT patch to ignore rfkill block

Change-Id: I624a38019f853988eabe65fb8552710d5dd7aeb7
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
---

diff --git a/configure.ac b/configure.ac
index dee2dcb..55e983b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,12 @@ AC_ARG_ENABLE(hh2serial-gps,
 AM_CONDITIONAL(HH2SERIAL_GPS, test "${enable_hh2serial_gps}" != "no")
 AM_CONDITIONAL(HH2SERIAL_GPS_BUILTIN, test "${enable_hh2serial_gps}" = "builtin")
 
+AC_ARG_ENABLE(tizen-ext,
+	AC_HELP_STRING([--enable-tizen-ext], [enable TIZEN extensions]),
+			[if (test "${enableval}" = "yes"); then
+				CFLAGS="$CFLAGS -DTIZEN_EXT"
+			fi])
+
 AC_ARG_ENABLE(telephony,
 	AC_HELP_STRING([--enable-telephony], [enable Telephony support]),
 			[enable_telephony=${enableval}], [enable_telephony="yes"])
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 830977e..7747d9b 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -94,6 +94,7 @@ chmod +x bootstrap
             --enable-threads \
             --enable-client \
             --enable-pacrunner \
+            --enable-tizen-ext \
             --enable-wifi=builtin \
 %if %{with connman_openconnect}
             --enable-openconnect \
diff --git a/resources/var/lib/connman/settings b/resources/var/lib/connman/settings
index ba476b5..36f38f5 100644
--- a/resources/var/lib/connman/settings
+++ b/resources/var/lib/connman/settings
@@ -1,4 +1,3 @@
-
 [global]
 OfflineMode=false
 
diff --git a/src/rfkill.c b/src/rfkill.c
index 960cfea..bbb4dd7 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -73,6 +73,7 @@ static enum connman_service_type convert_type(uint8_t type)
 	return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
+#if !defined TIZEN_EXT
 static enum rfkill_type convert_service_type(enum connman_service_type type)
 {
 	switch (type) {
@@ -95,6 +96,7 @@ static enum rfkill_type convert_service_type(enum connman_service_type type)
 
 	return NUM_RFKILL_TYPES;
 }
+#endif
 
 static GIOStatus rfkill_process(GIOChannel *chan)
 {
@@ -157,13 +159,20 @@ static GIOChannel *channel = NULL;
 
 int __connman_rfkill_block(enum connman_service_type type, bool block)
 {
+#if !defined TIZEN_EXT
 	uint8_t rfkill_type;
 	struct rfkill_event event;
 	ssize_t len;
 	int fd, err;
+#endif
 
 	DBG("type %d block %d", type, block);
 
+#if defined TIZEN_EXT
+	DBG("try to set rfkill block %d, but it's not permitted", block);
+
+	return 0;
+#else
 	rfkill_type = convert_service_type(type);
 	if (rfkill_type == NUM_RFKILL_TYPES)
 		return -EINVAL;
@@ -187,6 +196,7 @@ int __connman_rfkill_block(enum connman_service_type type, bool block)
 	close(fd);
 
 	return err;
+#endif
 }
 
 int __connman_rfkill_init(void)