From 99acc4440a66dbf25ed2dd38fc26a1e3d7c82f24 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 20 Jun 2024 10:52:21 +0200
Subject: [PATCH] Android: Provide more info when createAvd failed

Fixes: QTCREATORBUG-30852
Change-Id: I9334a25c6e15a615dbf52736c9369821ba0ff8b9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androiddevice.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 7e6e715dc86..4972c653c9d 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -974,8 +974,12 @@ expected_str<void> createAvd(const CreateAvdInfo &info, bool force)
 
     GuardLocker locker(s_instance->m_avdPathGuard);
     process.runBlocking();
-    if (process.result() != ProcessResult::FinishedWithSuccess)
-        return Utils::make_unexpected(process.exitMessage());
+    if (process.result() != ProcessResult::FinishedWithSuccess) {
+        const QString stdErr = process.stdErr();
+        const QString errorMessage = stdErr.isEmpty() ? process.exitMessage()
+                                                      : process.exitMessage() + "\n\n" + stdErr;
+        return Utils::make_unexpected(errorMessage);
+    }
     return {};
 }