From 8db22952bf6d7e8e3f82bff6de589c46c58ef33c Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Thu, 30 Jan 2014 10:49:54 +0900
Subject: [PATCH] Initiate monkey directly from stream. On some devices monkey
 crashes if we just connect and disconnect.

---
 lib/roles/device.js | 9 +++++----
 lib/util/devutil.js | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/roles/device.js b/lib/roles/device.js
index 1bcaab49..19f90be4 100644
--- a/lib/roles/device.js
+++ b/lib/roles/device.js
@@ -4,6 +4,7 @@ var util = require('util')
 var Promise = require('bluebird')
 var zmq = require('zmq')
 var adbkit = require('adbkit')
+var monkey = require('adbkit-monkey')
 
 var logger = require('../util/logger')
 var wire = require('../wire')
@@ -173,8 +174,8 @@ module.exports = function(options) {
         .then(function(port) {
           return devutil.waitForPort(adb, options.serial, port)
         })
-        .then(function(port) {
-          return adb.openMonkeyAsync(options.serial, port)
+        .then(function(conn) {
+          return monkey.connectStream(conn)
         })
         .then(function(monkey) {
           services.monkey =
@@ -203,8 +204,8 @@ module.exports = function(options) {
         .then(function(port) {
           return devutil.waitForPort(adb, options.serial, port)
         })
-        .then(function(port) {
-          return adb.openMonkeyAsync(options.serial, port)
+        .then(function(conn) {
+          return monkey.connectStream(conn)
         })
         .then(function(monkey) {
           services.input =
diff --git a/lib/util/devutil.js b/lib/util/devutil.js
index 45ec7a7d..7933c551 100644
--- a/lib/util/devutil.js
+++ b/lib/util/devutil.js
@@ -46,8 +46,8 @@ devutil.waitForPort = function(adb, serial, port) {
   }
   return adb.openTcpAsync(serial, port)
     .then(function(conn) {
-      conn.end()
-      return port
+      conn.port = port
+      return conn
     })
     .catch(closedError, function(err) {
       return Promise.delay(100)