From 6d00aac1092d813446a44fbb234995733233f003 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 31 Jan 2022 18:08:08 +0100 Subject: Android: extract parentId for hidden object in advance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit amends 850a7f1238e84b6960a84e12687e40cf939a44d9. We can't extract the parentId for the hidden object on Java side, because the Java call is executed in a separate thread, so the original hidden object can be destroyed somewhere in the middle of parentId() call. As a workaround, we get the parentId in advance, on C++ side, and pass it as a parameter to JNI function. Task-number: QTBUG-95764 Pick-to: 6.3 6.2 5.15 Change-Id: Ied2ab4ab39b947f3f582575cf77cc76fbac9e274 Reviewed-by: Jarkko Koivikko Reviewed-by: Jan Arve Sæther Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia --- .../java/src/org/qtproject/qt/android/bindings/QtActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/android/java/src') diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java index 9bfa8738b6..e4073948de 100644 --- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java @@ -1138,9 +1138,9 @@ public class QtActivity extends Activity QtNative.activityDelegate().notifyAccessibilityLocationChange(); } - public void notifyObjectHide(int viewId) + public void notifyObjectHide(int viewId, int parentId) { - QtNative.activityDelegate().notifyObjectHide(viewId); + QtNative.activityDelegate().notifyObjectHide(viewId, parentId); } public void notifyObjectFocus(int viewId) -- cgit v1.2.3