diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-18 15:16:25 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-22 07:32:58 +0000 |
| commit | 0f7abe3737275e43b914ddfff3fa86ca8678fb20 (patch) | |
| tree | 47ba7030e0aaf171a97eea9aaf895657094a03b0 | |
| parent | ab152497a0ca31b0cf5173ac180edcd69754b9f3 (diff) | |
Android: Don't start avd if AndroidDeviceInfo doesn't want it
If the avdname is empty, we have a physical device, rather than an
emulater, and no avd is necessary.
Change-Id: I5eeaa02ae505cce80da5f27ad9a5e1dddcabb4e2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 815f7a789f..b42c2df70c 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -247,7 +247,7 @@ void AndroidRunner::launchAVD() emit androidDeviceInfoChanged(info); if (info.isValid()) { AndroidAvdManager avdManager; - if (avdManager.findAvd(info.avdname).isEmpty()) { + if (!info.avdname.isEmpty() && avdManager.findAvd(info.avdname).isEmpty()) { bool launched = avdManager.startAvdAsync(info.avdname); m_launchedAVDName = launched ? info.avdname:""; } else { |