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

Android: Don't crash in AndroidAvdManager

Browse Source 
cancelChecker is an optional parameter.

Change-Id: Ie47ae834a34f8ebf8c901e4dcaf7a9c3af5c0ce4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2021-08-24 11:02:45 +02:00
parent 8c8519853c
commit bf2088075d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidavdmanager.cpp
View File

@@ -333,7 +333,7 @@ QString AndroidAvdManager::waitForAvd(const QString &avdName,
// 60 rounds of 2s sleeping, two minutes for the avd to start // 60 rounds of 2s sleeping, two minutes for the avd to start
QString serialNumber; QString serialNumber;
for (int i = 0; i < 60; ++i) { for (int i = 0; i < 60; ++i) {
if (cancelChecker()) if (cancelChecker && cancelChecker())
return QString(); return QString();
serialNumber = findAvd(avdName); serialNumber = findAvd(avdName);
if (!serialNumber.isEmpty()) if (!serialNumber.isEmpty())
@@ -365,7 +365,7 @@ bool AndroidAvdManager::waitForBooted(const QString &serialNumber,
{ {
// found a serial number, now wait until it's done booting... // found a serial number, now wait until it's done booting...
for (int i = 0; i < 60; ++i) { for (int i = 0; i < 60; ++i) {
if (cancelChecker()) if (cancelChecker && cancelChecker())
return false; return false;
if (isAvdBooted(serialNumber)) { if (isAvdBooted(serialNumber)) {
return true; return true;