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

Android: Make selector() arguments to runAdb implicit

Browse Source 
Less code on the user side.

Change-Id: Ibf19ca725557c2de67743bd3b4b621f04bb896c7
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2017-06-15 16:45:59 +02:00
parent 70e6bb2827
commit bfb0e025d9
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@ AndroidRunnerWorker::~AndroidRunnerWorker()
void AndroidRunnerWorker::forceStop() void AndroidRunnerWorker::forceStop()
{ {
runAdb(selector() << "shell" << "am" << "force-stop" << m_packageName, nullptr, 30); runAdb({"shell", "am", "force-stop", m_packageName}, nullptr, 30);
// try killing it via kill -9 // try killing it via kill -9
const QByteArray out = Utils::SynchronousProcess() const QByteArray out = Utils::SynchronousProcess()
@@ -376,21 +376,19 @@ void AndroidRunnerWorker::asyncStart(const QString &intentName,
QString errorMessage; QString errorMessage;
if (m_useCppDebugger) if (m_useCppDebugger)
runAdb(selector() << "shell" << "rm" << m_pongFile); // Remove pong file. runAdb({"shell", "rm", m_pongFile}); // Remove pong file.
foreach (const QStringList &entry, adbCommands) foreach (const QStringList &entry, adbCommands)
runAdb(selector() << entry); runAdb({entry});
QStringList args = selector(); QStringList args = {"shell", "am", "start", "-n", intentName};
args << "shell" << "am" << "start" << "-n" << intentName;
if (m_useCppDebugger) { if (m_useCppDebugger) {
if (!runAdb(selector() << "forward" << "--remove" << "tcp:" + m_localGdbServerPort.toString())) { if (!runAdb({"forward", "--remove", "tcp:" + m_localGdbServerPort.toString()})){
QTC_CHECK(false); QTC_CHECK(false);
} }
if (!runAdb(selector() << "forward" if (!runAdb({"forward", "tcp:" + m_localGdbServerPort.toString(),
<< "tcp:" + m_localGdbServerPort.toString() "localfilesystem:" + m_gdbserverSocket}, &errorMessage)) {
<< "localfilesystem:" + m_gdbserverSocket, &errorMessage)) {
emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1.").arg(errorMessage)); emit remoteProcessFinished(tr("Failed to forward C++ debugging ports. Reason: %1.").arg(errorMessage));
return; return;
} }
@@ -410,9 +408,8 @@ void AndroidRunnerWorker::asyncStart(const QString &intentName,
args << "-e" << "gdbserver_socket" << m_gdbserverSocket; args << "-e" << "gdbserver_socket" << m_gdbserverSocket;
if (m_handShakeMethod == SocketHandShake) { if (m_handShakeMethod == SocketHandShake) {
const QString port = QString::fromLatin1("tcp:%1").arg(m_socketHandShakePort); const QString port = QString("tcp:%1").arg(m_socketHandShakePort);
if (!runAdb(selector() << "forward" << port << ("localabstract:" + pingPongSocket), if (!runAdb({"forward", port, "localabstract:" + pingPongSocket}, &errorMessage)) {
&errorMessage)) {
emit remoteProcessFinished(tr("Failed to forward ping pong ports. Reason: %1.") emit remoteProcessFinished(tr("Failed to forward ping pong ports. Reason: %1.")
.arg(errorMessage)); .arg(errorMessage));
return; return;
@@ -422,8 +419,8 @@ void AndroidRunnerWorker::asyncStart(const QString &intentName,
if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) { if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) {
// currently forward to same port on device and host // currently forward to same port on device and host
const QString port = QString::fromLatin1("tcp:%1").arg(m_qmlPort.number()); const QString port = QString("tcp:%1").arg(m_qmlPort.number());
if (!runAdb(selector() << "forward" << port << port, &errorMessage)) { if (!runAdb({"forward", port, port}, &errorMessage)) {
emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1.") emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1.")
.arg(errorMessage)); .arg(errorMessage));
return; return;
@@ -431,7 +428,7 @@ void AndroidRunnerWorker::asyncStart(const QString &intentName,
args << "-e" << "qml_debug" << "true" args << "-e" << "qml_debug" << "true"
<< "-e" << "qmljsdebugger" << "-e" << "qmljsdebugger"
<< QString::fromLatin1("port:%1,block,services:%2") << QString("port:%1,block,services:%2")
.arg(m_qmlPort.number()).arg(QmlDebug::qmlDebugServices(m_qmlDebugServices)); .arg(m_qmlPort.number()).arg(QmlDebug::qmlDebugServices(m_qmlDebugServices));
} }
@@ -491,7 +488,7 @@ void AndroidRunnerWorker::asyncStart(const QString &intentName,
tmp.open(); tmp.open();
tmp.close(); tmp.close();
runAdb(selector() << "pull" << m_pingFile << tmp.fileName()); runAdb({"pull", m_pingFile, tmp.fileName()});
QFile res(tmp.fileName()); QFile res(tmp.fileName());
const bool doBreak = res.size(); const bool doBreak = res.size();
@@ -544,7 +541,7 @@ bool AndroidRunnerWorker::runAdb(const QStringList &args, QString *exitMessage,
{ {
Utils::SynchronousProcess adb; Utils::SynchronousProcess adb;
adb.setTimeoutS(timeoutS); adb.setTimeoutS(timeoutS);
Utils::SynchronousProcessResponse response = adb.run(m_adb, args); Utils::SynchronousProcessResponse response = adb.run(m_adb, m_selector + args);
if (exitMessage) if (exitMessage)
*exitMessage = response.exitMessage(m_adb, timeoutS); *exitMessage = response.exitMessage(m_adb, timeoutS);
return response.result == Utils::SynchronousProcessResponse::Finished; return response.result == Utils::SynchronousProcessResponse::Finished;
@@ -561,7 +558,7 @@ void AndroidRunnerWorker::handleRemoteDebuggerRunning()
Utils::TemporaryFile tmp("pingpong"); Utils::TemporaryFile tmp("pingpong");
tmp.open(); tmp.open();
runAdb(selector() << "push" << tmp.fileName() << m_pongFile); runAdb({"push", tmp.fileName(), m_pongFile});
} }
QTC_CHECK(m_processPID != -1); QTC_CHECK(m_processPID != -1);
} }
@@ -576,8 +573,8 @@ void AndroidRunnerWorker::asyncStop(const QVector<QStringList> &adbCommands)
if (m_processPID != -1) { if (m_processPID != -1) {
forceStop(); forceStop();
} }
foreach (const QStringList &entry, adbCommands) for (const QStringList &entry : adbCommands)
runAdb(selector() << entry); runAdb({entry});
} }
void AndroidRunnerWorker::setAdbParameters(const QString &packageName, const QStringList &selector) void AndroidRunnerWorker::setAdbParameters(const QString &packageName, const QStringList &selector)
@@ -671,9 +668,8 @@ void AndroidRunnerWorker::logcatReadStandardOutput()
void AndroidRunnerWorker::adbKill(qint64 pid) void AndroidRunnerWorker::adbKill(qint64 pid)
{ {
runAdb(selector() << "shell" << "kill" << "-9" << QString::number(pid)); runAdb({"shell", "kill", "-9", QString::number(pid)});
runAdb(selector() << "shell" << "run-as" << m_packageName runAdb({"shell", "run-as", m_packageName, "kill", "-9", QString::number(pid)});
<< "kill" << "-9" << QString::number(pid));
} }
AndroidRunner::AndroidRunner(RunControl *runControl) AndroidRunner::AndroidRunner(RunControl *runControl)