Fix adbkit API invocations (#524)

Update Adbkit to 3.2.3
This commit is contained in:
Karol Wrótniak
2022-05-05 18:43:22 +02:00
committed by GitHub
parent 481f220992
commit 6f09708304
14 changed files with 11712 additions and 11379 deletions

View File

@@ -3,6 +3,7 @@ var util = require('util')
var split = require('split')
var Promise = require('bluebird')
var androidDeviceList = require('android-device-list')
var deviceClient = require('@devicefarmer/adbkit').DeviceClient
var devutil = module.exports = Object.create(null)
@@ -71,7 +72,8 @@ devutil.listPidsByComm = function(adb, serial, comm, bin) {
})
}
return adb.shell(serial, 'ps 2>/dev/null')
var client = deviceClient(adb, serial)
return client.shell('ps 2>/dev/null')
.then(findProcess)
.then(function(res) {
// return pids if process can be found in the output of 'ps' command
@@ -81,7 +83,7 @@ devutil.listPidsByComm = function(adb, serial, comm, bin) {
}
// otherwise try to run 'ps -elf'
else {
return adb.shell(serial, 'ps -lef 2>/dev/null')
return client.shell('ps -lef 2>/dev/null')
.then(findProcess)
.then(function(res) {
return Promise.resolve(res.pids)