yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 19:42:01 +02:00
Code Issues Releases Wiki Activity

Update STFService.apk to 1.1.0. Switches to abstract sockets which fixes

Browse source 
adb getting stuck when tethering is being used.
This commit is contained in:
Simo Kinnunen 2016-09-03 04:01:07 +09:00
parent 94fd18aedf
commit 33e4e617bb
4 changed files with 14 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/units/device/plugins/service.js
View file

@ -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) {

2
lib/units/device/resources/service.js
View file

@ -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')