feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix package name search

Browse Source 
Android 7.0 ps doesn't add \r anymore to the EOL.

Task-number: QTCREATORBUG-16782
Change-Id: Iff596ac2c1eafd0c5422cbac5708c8b616c73ecf
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
BogDan Vatra
2016-08-25 16:10:13 +03:00
parent a3739fb14b
commit 84b7e199ac
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidrunner.cpp
View File

@@ -241,10 +241,16 @@ static int extractPidFromChunk(const QByteArray &chunk, int from)
static int extractPid(const QString &exeName, const QByteArray &psOutput)
{
const QByteArray needle = exeName.toUtf8() + '\r';
const int to = psOutput.indexOf(needle);
if (to == -1)
return -1;
static char psEol[]={'\r', '\n'};
QByteArray needle = exeName.toUtf8() + psEol[0];
int to = psOutput.indexOf(needle);
if (to == -1) {
needle = exeName.toUtf8() + psEol[1];
to = psOutput.indexOf(needle);
if (to == -1)
return -1;
std::swap(psEol[0], psEol[1]);
}
const int from = psOutput.lastIndexOf('\n', to);
if (from == -1)
return -1;