From 97a3434fde2d97b4daefede2bc218dc236a7f029 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 18 Dec 2023 16:07:14 +0200 Subject: [PATCH] Android: use m_context in QtServiceLoader.initContextInfo() since m_service will not be yet set, m_context should be used here. Task-number: QTBUG-115016 Change-Id: Ie259e703da1d8aac23117f032b7d146f7060aac2 Reviewed-by: Assam Boudjelthia Reviewed-by: Janne Juntunen Reviewed-by: Petri Virkkunen (cherry picked from commit fcc8b89ae01eb405c4cfa8fafd7b1b7068a2d033) Reviewed-by: Qt Cherry-pick Bot --- .../jar/src/org/qtproject/qt/android/QtServiceLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java index a9d3b31fbe9..281c871e929 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceLoader.java @@ -25,8 +25,8 @@ class QtServiceLoader extends QtLoader { @Override protected void initContextInfo() { try { - m_contextInfo = m_service.getPackageManager().getServiceInfo( - new ComponentName(m_service, m_service.getClass()), + m_contextInfo = m_context.getPackageManager().getServiceInfo( + new ComponentName(m_context, m_context.getClass()), PackageManager.GET_META_DATA); } catch (Exception e) { e.printStackTrace();