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

Android: Fix adbShellAmNeedsQuotes

Browse Source 
Regressions was introduced by ddefe062c7

Change-Id: I0bc3f75b788472db78998c32d0007d4250a62f5a
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
BogDan Vatra
2016-06-10 11:39:43 +03:00
parent 19b513c7a2
commit 4ce0494284
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,7 +487,8 @@ bool AndroidRunner::adbShellAmNeedsQuotes()
return true; return true;
const QString output = response.allOutput(); const QString output = response.allOutput();
return output.contains(QLatin1String("Error: No intent supplied")); const bool oldSdk = output.contains("Error: No intent supplied");
return !oldSdk;
} }
bool AndroidRunner::runAdb(const QStringList &args, QString *errorMessage, int timeoutS) bool AndroidRunner::runAdb(const QStringList &args, QString *errorMessage, int timeoutS)