aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Pachdha <vikas.pachdha@qt.io>2016-11-29 16:42:53 +0100
committerVikas Pachdha <vikas.pachdha@qt.io>2016-11-29 17:00:58 +0000
commit24ae8e04918c188d0f10e356a9c6ec026ac0ff39 (patch)
treea1073db1032af318fd7529a1d36ed966cf2772de
parent329c24ce3a1bab724f7607e0174be00f44db6193 (diff)
Android: Change polling pid script to fix permission denied issuesv4.2.0-rc1
Task-number: QTCREATORBUG-17272 Change-Id: Ia45ad8b2bd9e1d1c984c600d320241b81580d85f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/plugins/android/androidrunner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 585e09d787..f3110db2da 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -126,7 +126,8 @@ const int MIN_SOCKET_HANDSHAKE_PORT = 20001;
const int MAX_SOCKET_HANDSHAKE_PORT = 20999;
static const QString pidScript = QStringLiteral("for p in /proc/[0-9]*; "
"do cat <$p/cmdline && echo :${p##*/}; done");
-static const QString pidPollingScript = QStringLiteral("while true; do sleep 1; kill -0 %1; done");
+static const QString pidPollingScript = QStringLiteral("while true; do sleep 1; "
+ "cat /proc/%1/cmdline > /dev/null; done");
static int APP_START_TIMEOUT = 45000;
static bool isTimedOut(const chrono::high_resolution_clock::time_point &start,