summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidruncontrol.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Android: Enable setting environment variables for android appsVikas Pachdha2018-08-021-3/+2
| | | | | Change-Id: Id4625f081d6997dcabad9b01fb09d6c9c6ef7477 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Support commandline arguments for Android appVikas Pachdha2018-08-021-2/+1
| | | | | | Change-Id: I3910b68ebbf00e1b62da663a3e58224413a1929e Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: hjk <hjk@qt.io>
* Android: Support the extraenvvars and extraappparams optionsUlf Hermann2018-02-141-2/+4
| | | | | | | | | | The Qt/Android runtime does support passing parameters to the application. We have to pass '-e extraappparams <base64 string>' and '-e extraenvvars <base64 strings, concatenated by ";">'. This is very handy and should actually be exposed in the GUI. Change-Id: I8c84a53ab8f6f07ea5b6e01c902f53385df8b35f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Android: Convert into a RunWorker based setuphjk2017-06-121-43/+8
| | | | | | | | | This moves all of the RunControl implementation into a single RunWorker, not yet splitting it up into separate RunWorkers which is the final goal of this series. Change-Id: I7373105603505aa4fffd7fe5ff0145f0128b34bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-041-7/+0
|\ | | | | | | | | | | | | Conflicts: tests/auto/debugger/tst_dumpers.cpp Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc
| * Revert "Android: Improve application output window by adding filters"Ulf Hermann2017-04-281-7/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit d4ca232d54a9a5dabc6955139f3d3c2dcb0875f0 and fixes QML profiling on android. Task-number: QTCREATORBUG-18120 Change-Id: I09b9062da197a4c6c0a7034f98a2bb0b41f1d559 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-04-191-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/genericprojectmanager/genericproject.cpp src/plugins/genericprojectmanager/genericproject.h src/plugins/genericprojectmanager/genericprojectnodes.cpp src/plugins/genericprojectmanager/genericprojectnodes.h Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
| * Android: Improve application output window by adding filtersBogDan Vatra2017-04-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow the user to choose the visible log levels - allow the user to choose which activities/service(s) logs are visible - wakeup the device (API 20+) - use only the most recent logs (API 21+ add "-T 0" to logcat params) - use logcat -v time format, which is the same on all Android versions In the future we can even allow the user to choose which parts of the log line are visible, e.g. time, log level, TAG, PID, Message Task-number: QTCREATORBUG-16887 Change-Id: I07ce00aff59a479660f5ac6da75eef973ba3f627 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | Android: Adapt to ProjectExplorer::ToolRunner introductionhjk2017-03-301-1/+1
| | | | | | | | | | | | Change-Id: I71cc25ef3daa0eee51a4c94285174e0f3b45d41f Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: Run RunControl::{start,stop} always asynchronouslyhjk2017-03-241-2/+1
|/ | | | | | | | | | | | | | | | This introduces a mini-state-"machine" to handle RunControl states Intialized->[Starting->Running->Stopping->Stopped->]*->Finished. Needing time between trying to start and getting feedback is nowadays the normal setup for all remote targets as well as for most local tools. Making that the default for all runs simplifies the code and provides an opportunity to (a) fix some currently wrong reports of "stopped immediately" and (b) to remove target-specific (WinRT) or tool-specific (Valgrind, GammaRay) state members doing essentially the same. Change-Id: I7f52fee41144188ee8389e922fdc265f8c0a6459 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Unify RunControl setup/teardownTobias Hunger2017-03-011-10/+2
| | | | | | | | | | | | | | Provide protected methods in RunControl to handle the notification of when the RunControl starts and stops. Use these helpers to move the isRunning() method into the RunConfiguration itself instead of reimplementing it everywhere. Change-Id: Ia8de42f7a6a14a049870d4e7fcb9af6756c2caa4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Move icons to UtilsUlf Hermann2016-08-051-2/+2
| | | | | | | This way we can use them from libraries, not only from plugins. Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Use Qt5-style connectsOrgad Shaneh2016-07-041-6/+6
| | | | | | | The heavy lifting was done by clazy. Change-Id: Id09b62b7b9812d9c0981202c257d18387a8b09d9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Theme: Separate run/stop/interrupt icons in menusAlessandro Portale2016-04-211-1/+1
| | | | | | | And for that, we also need separate theme color roles. Change-Id: I27bf4499acb516f7f824f5e57632797653b150ec Reviewed-by: hjk <hjk@theqtcompany.com>
* Icons: Move Run/Stop/Interrupt from projectexplorer to coreAlessandro Portale2016-04-101-2/+3
| | | | | Change-Id: Iba65c2ede538049c9b203fd4c2f99ef552019862 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Add AndroidRunnableBogDan Vatra2016-01-291-0/+2
| | | | | | | | Using the AndroidRunnable is easy for other plugins to run custom adb commands before intent is started and after it's stopped. Change-Id: I012ae87c92cea16aa8074dce2dc6f2b0c4ebeb30 Reviewed-by: hjk <hjk@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-18/+13
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-1/+2
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Use Core::Id as RunMode "enum values"BogDan Vatra2015-06-301-2/+2
| | | | | | | | | | | | | This provides a way for third-party plugins to implement run modes without the need to add a value to the central enum or using manual workarounds like RunMode(*(int*)&someUniqueObject). Instead of centrally defined enum values this uses Core::Id that could be defined anywhere. Change-Id: Ic350e3d8dbb8042c61b2d4ffec993ca151f53099 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Android M: Support new logcat outputDaniel Teske2015-06-251-8/+8
| | | | | | | Change-Id: I64ae6493b45b3f1cac82e7f5e1ae77ec3b910bc9 Task-number: QTCREATORBUG-14534 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Android: Remove Necessitas supportBogDan Vatra2014-07-211-1/+0
|/ | | | | Change-Id: I082acfad3b20d5e096fbb2ca3db775bb527eaf7a Reviewed-by: BogDan Vatra <bogdan@kde.org>
* RunControl: Make icon(path) a value memberhjk2014-05-301-7/+1
| | | | | Change-Id: I7f7099d03a25a14d8df02273cca928e9f1fbfe1d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Android: Fix rerun iconDaniel Teske2013-11-201-1/+1
|/ | | | | | Task-number: QTCREATORBUG-10850 Change-Id: Ic6ac01b1aa57b99fed899c3d9c6e6663b397afc5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Rename namespace Qt4ProjectManager to QmakeProjectManagerhjk2013-10-161-1/+1
| | | | | | | First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Android: Add QML profilingAurindam Jana2013-05-061-1/+1
| | | | | | Change-Id: Ie06c0b49707f8ec549f180f41c565fd223240186 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* QtSupport: Forward-declare some classes.Friedemann Kleint2013-03-271-0/+2
| | | | | Change-Id: I7f0eb6c4ea8620c8405f6d13c554c0ec913edd63 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove useless warning dialog.BogDan Vatra2013-01-211-1/+1
|/ | | | | | | Redirect the errors to the application output window. Change-Id: I927fae72a53314d0200ffbd13c68900d15259cf9 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix crash when pressing stop buttonBogDan Vatra2013-01-151-1/+1
| | | | | Change-Id: If1902153404c49516cf4e535655dbbb5a8135b1c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Adjust license headershjk2012-10-051-19/+18
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Android: check UI text for style and grammarLeena Miettinen2012-10-011-1/+1
| | | | | | Change-Id: I8b808cf374fcdc124c5b2b7d9a113e6d64b17f2f Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* android: code cosmeticshjk2012-08-121-6/+3
| | | | | | | | | Fix whitespace, capitalization, naming, comments, add 'using' in .cpp, remove 'using' in .h, remove unneeded Q_UNUSED, add needed Q_UNUSED, etc. Change-Id: Ibf9ba57850cbea1e79e152ec0165c8b01fa66567 Reviewed-by: hjk <qthjk@ovi.com>
* Improved translated stringsRobert Loehning2012-08-021-1/+1
| | | | | Change-Id: I92e2a87d063894d4992451ee0e9fe2a99d298eb2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Normalized connect()sRobert Loehning2012-07-261-2/+2
| | | | | Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Android: Add QML debugging supportTyler Mandry2012-07-171-1/+0
| | | | | | Change-Id: I2fb2c75001569385e417ea44ae90d34e92a22449 Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Android pluginBogDan Vatra2012-04-241-0/+119
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>