From 5855be0fb313f9ceda37255c190924ef088c1918 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 18 Dec 2023 17:26:40 +0200 Subject: [PATCH] Android: return String regardless from QtLoader.getMetaData() To avoid exceptions if the metadata is a non-string like boolean or integer. Task-number: QTBUG-115016 Change-Id: I104e6b2954873e74bc100cb965ee8ea9b6d14568 Reviewed-by: Janne Juntunen Reviewed-by: Petri Virkkunen Reviewed-by: Assam Boudjelthia (cherry picked from commit 400e7d1a758394df350cbdcbc6cff3683976b789) Reviewed-by: Qt Cherry-pick Bot --- src/android/jar/src/org/qtproject/qt/android/QtLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java index 352645fc074..a93dbd76598 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java @@ -300,7 +300,7 @@ abstract class QtLoader { if (metadata == null || !metadata.containsKey(key)) return ""; - return metadata.getString(key); + return String.valueOf(metadata.get(key)); } @SuppressLint("DiscouragedApi")