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

Android: Lower the time-out for license checks

Browse Source 
An issue in SynchronousProcess causes a time-out when the process output
is not terminated with a \n or \r.

This workaround lowers the timeout from 600 to 4 so that the
unterminated output gets consumed nevertheless, and the user needs to
wait only 4 seconds for that.

Task-number: QTCREATORBUG-25667
Change-Id: I40f3053c7c4948c27003e9ec73d00a9d660024a4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-05-10 12:08:56 +02:00
parent 627f298ce1
commit 20604cedd8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidsdkmanager.cpp
View File

@@ -1014,10 +1014,12 @@ void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdFutureInterface &fi)
AndroidSdkManager::OperationOutput result; AndroidSdkManager::OperationOutput result;
result.type = AndroidSdkManager::LicenseCheck; result.type = AndroidSdkManager::LicenseCheck;
const QStringList args = {"--licenses", sdkRootArg(m_config)}; const QStringList args = {"--licenses", sdkRootArg(m_config)};
if (!fi.isCanceled()) if (!fi.isCanceled()) {
sdkManagerCommand(m_config, args, m_sdkManager, fi, result, 100.0); const int timeOutS = 4; // Short timeout as workaround for QTCREATORBUG-25667
else sdkManagerCommand(m_config, args, m_sdkManager, fi, result, 100.0, true, timeOutS);
} else {
qCDebug(sdkManagerLog) << "Update: Operation cancelled before start"; qCDebug(sdkManagerLog) << "Update: Operation cancelled before start";
}
fi.reportResult(result); fi.reportResult(result);
fi.setProgressValue(100); fi.setProgressValue(100);