From 36f62f3276a1e6eed03b20b9c9cfa4c66bdaa06d Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Fri, 30 May 2014 00:00:24 +0900
Subject: [PATCH] F-06E doesn't find the STFService if we don't tell it which
 component to use.

---
 lib/roles/device/plugins/service.js   | 6 +++++-
 lib/roles/device/resources/service.js | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/roles/device/plugins/service.js b/lib/roles/device/plugins/service.js
index 5d5102ea..cf387cf7 100644
--- a/lib/roles/device/plugins/service.js
+++ b/lib/roles/device/plugins/service.js
@@ -147,7 +147,11 @@ module.exports = syrup.serial()
     // So, we should be good to go.
     function openService() {
       log.info('Launching service')
-      return callService(util.format("-a '%s'", apk.startAction))
+      return callService(util.format(
+          "-a '%s' -n '%s'"
+        , apk.startIntent.action
+        , apk.startIntent.component
+        ))
         .then(function() {
           return devutil.waitForPort(adb, options.serial, service.port)
             .timeout(15000)
diff --git a/lib/roles/device/resources/service.js b/lib/roles/device/resources/service.js
index ae8d5edd..e9a514c7 100644
--- a/lib/roles/device/resources/service.js
+++ b/lib/roles/device/resources/service.js
@@ -22,8 +22,10 @@ module.exports = syrup.serial()
     , wire: ProtoBuf.loadProtoFile(
         pathutil.vendor('STFService/wire.proto')
       ).build().jp.co.cyberagent.stf.proto
-    , startAction: 'jp.co.cyberagent.stf.ACTION_START'
-    , stopAction: 'jp.co.cyberagent.stf.ACTION_STOP'
+    , startIntent: {
+        action: 'jp.co.cyberagent.stf.ACTION_START'
+      , component: 'jp.co.cyberagent.stf/.Service'
+      }
     }
 
     function getPath() {