Bug 1119962 - Work around 'adb shell' bustedness in newer Android tools r=gbrown

This commit is contained in:
James Willcox 2015-03-03 16:22:36 -06:00
parent b0021dc8e1
commit 96b90bb043

View File

@ -350,7 +350,7 @@ class DeviceManagerADB(DeviceManager):
self._checkCmd(["shell"] + cmd)
return outputFile
acmd = ["shell", "am", "start", "-W"]
acmd = ["-W"]
cmd = ' '.join(cmd).strip()
i = cmd.find(" ")
# SUT identifies the URL by looking for :\\ -- another strategy to consider
@ -379,7 +379,9 @@ class DeviceManagerADB(DeviceManager):
envCnt += 1
if uri != "":
acmd.append("-d")
acmd.append(''.join(['\'',uri, '\'']));
acmd.append(uri)
acmd = ["shell", ' '.join(map(lambda x: '"' + x + '"', ["am", "start"] + acmd))]
self._logger.info(acmd)
self._checkCmd(acmd)
return outputFile