From b9a7cedb6ebd85f249f54c8688943346c7a98260 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Mon, 1 Sep 2014 13:27:23 +0200 Subject: Android: Avoid deadlock in Qt.inputMethod.visible A blocking isSoftwareKeyboardVisible() is a deadlock waiting to happen: when the android input method performs blocking metacalls from the android thread to the GUI thread all the time, we cannot block the GUI thread waiting for the android thread. Task-number: QTBUG-40750 Change-Id: I2490897b0f65e0d92214907e239b10b372d949dd Reviewed-by: Christian Stromme --- .../org/qtproject/qt5/android/QtActivityDelegate.java | 5 ----- .../jar/src/org/qtproject/qt5/android/QtNative.java | 19 ------------------- 2 files changed, 24 deletions(-) (limited to 'src/android') diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 8e8b50f737..9e067f14c5 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -361,11 +361,6 @@ public class QtActivityDelegate }); } - public boolean isSoftwareKeyboardVisible() - { - return m_keyboardIsVisible; - } - String getAppIconSize(Activity a) { int size = a.getResources().getDimensionPixelSize(android.R.dimen.app_icon_size); diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index 0107cff23a..0e2af9a192 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -397,25 +397,6 @@ public class QtNative }); } - private static boolean isSoftwareKeyboardVisible() - { - final Semaphore semaphore = new Semaphore(0); - final Boolean[] ret = {false}; - runAction(new Runnable() { - @Override - public void run() { - ret[0] = m_activityDelegate.isSoftwareKeyboardVisible(); - semaphore.release(); - } - }); - try { - semaphore.acquire(); - } catch (Exception e) { - e.printStackTrace(); - } - return ret[0]; - } - private static void setFullScreen(final boolean fullScreen) { runAction(new Runnable() { -- cgit v1.2.3