Modify the ag-agent daemon for On-demand mode

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

diff --git a/ag-agent/org.bluez.ag_agent.service b/ag-agent/org.bluez.ag_agent.service
index 0845116..5cd68b3 100644 (file)
--- a/ag-agent/org.bluez.ag_agent.service
+++ b/ag-agent/org.bluez.ag_agent.service
@@ -1,4 +1,5 @@
 [D-BUS Service]
 Name=org.bluez.ag_agent
-Exec=/dev/false
-SystemdService=bluetooth-ag-agent.service
+Exec=/usr/bin/bluetooth-ag-agent
+User=system
+Group=system

diff --git a/packaging/bluetooth-ag-agent.service b/packaging/bluetooth-ag-agent.service
deleted file mode 100755 (executable)
index 77b4f16..0000000
--- a/packaging/bluetooth-ag-agent.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Service to launch AG agent.
-After=dbus.socket dbus.service
-Requires=dbus.socket
-
-[Service]
-Type=dbus
-BusName=org.bluez.ag_agent
-ExecStart=/usr/bin/bluetooth-ag-agent
-ExecStop=/usr/bin/killall bluetooth-ag-agent
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec
index e617298..d43e2ba 100644 (file)
--- a/packaging/bluetooth-agent.spec
+++ b/packaging/bluetooth-agent.spec
@@ -76,10 +76,10 @@ rm -rf %{buildroot}
 
 install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/bluetooth-agent
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-%if "%{?profile}" != "wearable"
-install -m 0644 packaging/bluetooth-ag-agent.service %{buildroot}%{_unitdir}/
-ln -s ../bluetooth-ag-agent.service %{buildroot}%{_unitdir}/multi-user.target.wants/bluetooth-ag-agent.service
-%endif
+#%if "%{?profile}" != "wearable"
+#install -m 0644 packaging/bluetooth-ag-agent.service %{buildroot}%{_unitdir}/
+#ln -s ../bluetooth-ag-agent.service %{buildroot}%{_unitdir}/multi-user.target.wants/bluetooth-ag-agent.service
+#%endif
 
 %files
 %manifest %{name}.manifest
@@ -94,8 +94,8 @@ ln -s ../bluetooth-ag-agent.service %{buildroot}%{_unitdir}/multi-user.target.wa
 %{_datadir}/dbus-1/system-services/org.bluez.pb_agent.service
 %{_datadir}/dbus-1/system-services/org.bluez.map_agent.service
 %{_datadir}/dbus-1/system-services/org.bluez.ag_agent.service
-%{_usrlibdir}/systemd/system/bluetooth-ag-agent.service
-%{_usrlibdir}/systemd/system/multi-user.target.wants/bluetooth-ag-agent.service
+#%{_usrlibdir}/systemd/system/bluetooth-ag-agent.service
+#%{_usrlibdir}/systemd/system/multi-user.target.wants/bluetooth-ag-agent.service
 %attr(0666,-,-) /opt/var/lib/bluetooth/voice-recognition-blacklist
 %{_sysconfdir}/dbus-1/system.d/bluetooth-ag-agent.conf
 %endif