2 files changed, 14 insertions, 12 deletions
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp
index 3b1ce6d21d..eeaecd53b4 100644
--- a/src/plugins/platforms/android/androidjniaccessibility.cpp
+++ b/src/plugins/platforms/android/androidjniaccessibility.cpp
@@ -49,6 +49,7 @@
 #include <QtCore/qmath.h>
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtCore/private/qjni_p.h>
+#include <QtGui/private/qhighdpiscaling_p.h>
 
 #include "qdebug.h"
 
@@ -137,7 +138,7 @@ namespace QtAndroidAccessibility
         QRect rect;
         QAccessibleInterface *iface = interfaceFromId(objectId);
         if (iface && iface->isValid()) {
-            rect = iface->rect();
+            rect = QHighDpi::toNativePixels(iface->rect(), iface->window());
         }
 
         jclass rectClass = env->FindClass("android/graphics/Rect");
@@ -150,11 +151,13 @@ namespace QtAndroidAccessibility
     {
         QAccessibleInterface *root = interfaceFromId(-1);
         if (root) {
-            QAccessibleInterface *child = root->childAt((int)x, (int)y);
+            QPoint pos = QHighDpi::fromNativePixels(QPoint(int(x), int(y)), root->window());
+
+            QAccessibleInterface *child = root->childAt(pos.x(), pos.y());
             QAccessibleInterface *lastChild = 0;
             while (child && (child != lastChild)) {
                 lastChild = child;
-                child = child->childAt((int)x, (int)y);
+                child = child->childAt(pos.x(), pos.y());
             }
             if (lastChild)
                 return QAccessible::uniqueId(lastChild);
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index 1f681cc1a3..0fabb25233 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -402,11 +402,6 @@ namespace QtAndroid
         if (surfaceId == -1)
             return;
 
-        QMutexLocker lock(&m_surfacesMutex);
-        const auto &it = m_surfaces.find(surfaceId);
-        if (it != m_surfaces.end())
-            m_surfaces.remove(surfaceId);
-
         QJNIEnvironmentPrivate env;
         if (!env)
             return;
@@ -583,14 +578,18 @@ static void setSurface(JNIEnv *env, jobject /*thiz*/, jint id, jobject jSurface,
 {
     QMutexLocker lock(&m_surfacesMutex);
     const auto &it = m_surfaces.find(id);
-    if (it.value() == nullptr) // This should never happen...
-        return;
-
     if (it == m_surfaces.end()) {
         qWarning()<<"Can't find surface" << id;
         return;
     }
-    it.value()->surfaceChanged(env, jSurface, w, h);
+    auto surfaceClient = it.value();
+    if (!surfaceClient) // This should never happen...
+        return;
+
+    surfaceClient->surfaceChanged(env, jSurface, w, h);
+
+    if (!jSurface)
+        m_surfaces.erase(it);
 }
 
 static void setDisplayMetrics(JNIEnv */*env*/, jclass /*clazz*/,