mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-18 11:53:23 +02:00
Update STFService.apk to 1.1.0. Switches to abstract sockets which fixes
adb getting stuck when tethering is being used.
This commit is contained in:
@@ -42,14 +42,14 @@ module.exports = syrup.serial()
|
||||
var agent = {
|
||||
socket: null
|
||||
, writer: null
|
||||
, port: 1090
|
||||
, sock: 'localabstract:stfagent'
|
||||
}
|
||||
|
||||
var service = {
|
||||
socket: null
|
||||
, writer: null
|
||||
, reader: null
|
||||
, port: 1100
|
||||
, sock: 'localabstract:stfservice'
|
||||
}
|
||||
|
||||
function stopAgent() {
|
||||
@@ -229,7 +229,7 @@ module.exports = syrup.serial()
|
||||
, apk.startIntent.component
|
||||
))
|
||||
.then(function() {
|
||||
return devutil.waitForPort(adb, options.serial, service.port)
|
||||
return devutil.waitForLocalSocket(adb, options.serial, service.sock)
|
||||
.timeout(15000)
|
||||
})
|
||||
.then(function(conn) {
|
||||
@@ -270,7 +270,7 @@ module.exports = syrup.serial()
|
||||
return stopAgent()
|
||||
.timeout(15000)
|
||||
.then(function() {
|
||||
return devutil.ensureUnusedPort(adb, options.serial, agent.port)
|
||||
return devutil.ensureUnusedLocalSocket(adb, options.serial, agent.sock)
|
||||
.timeout(10000)
|
||||
})
|
||||
.then(function() {
|
||||
@@ -285,7 +285,7 @@ module.exports = syrup.serial()
|
||||
streamutil.talk(log, 'Agent says: "%s"', out)
|
||||
})
|
||||
.then(function() {
|
||||
return devutil.waitForPort(adb, options.serial, agent.port)
|
||||
return devutil.waitForLocalSocket(adb, options.serial, agent.sock)
|
||||
.timeout(10000)
|
||||
})
|
||||
.then(function(conn) {
|
||||
|
||||
@@ -17,7 +17,7 @@ module.exports = syrup.serial()
|
||||
pathutil.vendor('STFService/wire.proto'))
|
||||
|
||||
var resource = {
|
||||
requiredVersion: '1.0.2'
|
||||
requiredVersion: '1.1.0'
|
||||
, pkg: 'jp.co.cyberagent.stf'
|
||||
, main: 'jp.co.cyberagent.stf.Agent'
|
||||
, apk: pathutil.vendor('STFService/STFService.apk')
|
||||
|
||||
Reference in New Issue
Block a user