From fea16708b7d95b138463eedd32e1a49844232be5 Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Thu, 3 May 2018 08:05:04 +0200
Subject: [PATCH] Android: Do not start AVD when AVD name is empty

Task-number: QTCREATORBUG-20350
Change-Id: I36b5c81b05b34c3caa515b32b504c4441b2a1f2b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/android/androiddeployqtstep.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 5cf723fe692..825b239560b 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -227,7 +227,8 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
     m_adbPath = AndroidConfigurations::currentConfig().adbToolPath().toString();
 
     AndroidAvdManager avdManager;
-    if (avdManager.findAvd(m_avdName).isEmpty())
+    // Start the AVD if not running.
+    if (!m_avdName.isEmpty() && avdManager.findAvd(m_avdName).isEmpty())
         avdManager.startAvdAsync(m_avdName);
     return true;
 }