summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2017-03-07 13:47:43 +0100
committerLars Schmertmann <lars.schmertmann@governikus.de>2017-03-08 07:09:30 +0000
commit9a4ca9260dc92bb5e1e96c7d66639661e4ea8808 (patch)
tree045a1c1e4c84d9160f628529011c756a560de708
parent402cbe22407133a38e319af7af676e68708c577d (diff)
NFC on Android: Fix crash on restart of an app
Task-number: QTBUG-59343 Change-Id: Id40844b428eb7ef781f8abc4dc3ce0c7469d178a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/nfc/qnearfieldmanager_android.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nfc/qnearfieldmanager_android.cpp b/src/nfc/qnearfieldmanager_android.cpp
index d7db6ecf..a5693218 100644
--- a/src/nfc/qnearfieldmanager_android.cpp
+++ b/src/nfc/qnearfieldmanager_android.cpp
@@ -269,6 +269,10 @@ QByteArray QNearFieldManagerPrivateImpl::getUid(const QAndroidJniObject &intent)
void QNearFieldManagerPrivateImpl::onTargetDiscovered(QAndroidJniObject intent)
{
+ // Only intents with a tag are relevant
+ if (!AndroidNfc::getTag(intent).isValid())
+ return;
+
// Getting UID
QByteArray uid = getUid(intent);