summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src/org/qtproject/qt/android/QtNative.java
diff options
context:
space:
mode:
authorSamuel Mira <samuel.mira@qt.io>2022-10-25 13:51:02 +0300
committerSamuel Mira <samuel.mira@qt.io>2022-10-26 09:27:42 +0300
commit98a9c384371721dc10faa4022bd30c85e6a0f45b (patch)
tree1345062ffa8c59a1a379f9ebb1777743d0a7a8e8 /src/android/jar/src/org/qtproject/qt/android/QtNative.java
parent11cc74b0661bdad122857e0405cced57d9a6bad7 (diff)
Fix crash on access clipboard on Android
A case where the accessing the clipboard is done when the application does not have the input focus. Android does not allow access in this case and returns null on the getPrimaryClip. This happens on some examples like Analog Clock. Does not happen on autotests. Fix was adding a test for null. Fixes: QTBUG-107926 Change-Id: I685594545e5ae8102c257c033fffbcc4f20cef9a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt/android/QtNative.java')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtNative.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/QtNative.java
index 4310a62f51..f2ab7bb131 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtNative.java
@@ -1103,8 +1103,10 @@ public class QtNative
if (m_clipboardManager == null)
return false;
- ClipData clip = m_clipboardManager.getPrimaryClip();
- ClipDescription description = clip.getDescription();
+ ClipDescription description = m_clipboardManager.getPrimaryClipDescription();
+ // getPrimaryClipDescription can fail if the app does not have input focus
+ if (description == null)
+ return false;
for (int i = 0; i < description.getMimeTypeCount(); ++i) {
String itemMimeType = description.getMimeType(i);