From 8c5ea5b368aadb4f0394d07dd4fc2bcf41b65224 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 6 Feb 2024 12:12:43 +0200
Subject: [PATCH] Android: fix style extraction when set to none

If extract_android_style meta data is set to none currently the app
still tries to extract full stlye and crashes. If this option is set
no style data should be extracted after this patch.

Fixes: QTBUG-121667
Change-Id: I764e1eb6a582073196f991ca930d245d17a1f7e5
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit ff6a6d3285c48d5e54bf03361115116f58461e33)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../platform/androidnotifier/android/AndroidManifest.xml      | 4 ----
 .../jar/src/org/qtproject/qt/android/ExtractStyle.java        | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
index 1936f901083..a77ed4ab12f 100644
--- a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
+++ b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
@@ -41,10 +41,6 @@
             <meta-data
                 android:name="android.app.background_running"
                 android:value="false"/>
-
-            <meta-data
-                android:name="android.app.extract_android_style"
-                android:value="none" />
         </activity>
     </application>
 </manifest>
diff --git a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
index b17293c905b..6780634317a 100644
--- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
@@ -154,6 +154,9 @@ class ExtractStyle {
         String dataDir = context.getApplicationInfo().dataDir;
         m_stylePath = dataDir + "/qt-reserved-files/android-style/" + dpi + "/";
 
+        if (extractOption.equals("none"))
+            return m_stylePath;
+
         if (extractOption.isEmpty())
             extractOption = "minimal";