diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2017-01-26 15:02:37 +0100 |
|---|---|---|
| committer | André Klitzing <aklitzing@gmail.com> | 2017-01-26 15:59:59 +0000 |
| commit | 3a978da2e9b1614a6f3abc1af55ae42ac86cb4c0 (patch) | |
| tree | c8c054aa773fbd372ff78b7a645fba9fb989998d /src/android | |
| parent | 6210bfa8f745c0af3e0d178bd03f99186aae34d6 (diff) | |
Avoid app crash on android when using nfc within a service
Change-Id: I28a165c7b7503b1c8159dd0c46f3f7450e599c74
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java b/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java index 47dcf1bf..4f39eb47 100644 --- a/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java +++ b/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java @@ -153,6 +153,8 @@ public class QtNfc static public boolean isAvailable() { + if (m_activity == null) return false; + m_adapter = NfcAdapter.getDefaultAdapter(m_activity); if (m_adapter == null) { //Log.e(TAG, "No NFC available (Adapter is null)"); |