Add the rfkill udev rule file

Change-Id: I8e7af48093446359d684eb1743f140688abfd8b2
Signed-off-by: Hyuk Lee <hyuk0512.lee@samsung.com>

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index ad4222a15ff0a3766c12f65df5d9d1f56bc0a48b..9c682570c1612efc8e1733499f73a3a1ec31e615 100644 (file)
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -189,13 +189,6 @@ static int __bt_stack_up(void)
                return -1;
        }
 
-       /* unblock rfkill */
-       ret = __bt_call_systemact_service(BT_SYSTEMACT_RFKILL_UNBLOCK);
-       if (ret < 0) {
-               BT_ERR("Failed to call systemact service");
-               return -1;
-       }
-
        ret = __execute_command("/usr/etc/bluetooth/bt-stack-up.sh", NULL);
        if (ret < 0) {
                BT_ERR("Failed to run script");
@@ -277,7 +270,6 @@ int _bt_enable_adapter(void)
 int _bt_disable_adapter(void)
 {
        bt_status_t status;
-       int ret;
 #if 0
        bt_le_status_t le_status;
 #endif
@@ -374,14 +366,6 @@ int _bt_disable_adapter(void)
 #endif
        }
 
-       /* block rfkill */
-       ret = __bt_call_systemact_service(BT_SYSTEMACT_RFKILL_BLOCK);
-       if (ret < 0) {
-               BT_ERR("Failed to call systemact service");
-               return -1;
-       }
-
-
        return 0;
 }
 

diff --git a/packaging/99-bluetooth-rfkill.rules b/packaging/99-bluetooth-rfkill.rules
new file mode 100644 (file)
index 0000000..d46e233
--- /dev/null
+++ b/packaging/99-bluetooth-rfkill.rules
@@ -0,0 +1 @@
+KERNEL=="rfkill", MODE="0664", GROUP="network_fw"

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index b3b7c9c4423068e5229851a846bbe4e59fd8e611..44b88d1e36a645aeff1efd85fa06a177556a4690 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -337,6 +337,9 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_unitdir}/starter.target.wants
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d
+
+cp packaging/99-bluetooth-rfkill.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/99-bluetooth-rfkill.rules
 
 # extension-emulator
 %ifarch %{ix86} x86_64
@@ -458,6 +461,7 @@ popd
 %{_datadir}/dbus-1/system-services/org.projectx.bt_core.service
 %{_bindir}/bt-core
 %{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-core.conf
+%{_prefix}/lib/udev/rules.d/99-bluetooth-rfkill.rules
 
 %files test
 %manifest %{name}.manifest