diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-09-20 12:53:39 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-09-20 11:13:42 +0000 |
| commit | e395e79145ff861b2dd87e404d229d769a19ab7e (patch) | |
| tree | a87f89b2f9ea7c251a3c5187010957bcc2c9f678 /src/android | |
| parent | 04cb6e2754529d503050ec5841e23c273afaae96 (diff) | |
Fix QtNative.checkSelfPermission()
Only return activity object when available and *not* when unavailable.
Task-number: QTBUG-55035
Task-number: QTBUG-50759
Change-Id: I60b1be528b2e4a3d630f4085b7642d74e18482bd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 6876aac11f..af4f20679c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -456,7 +456,7 @@ public class QtNative } public static Context getContext() { - if (m_activity == null) + if (m_activity != null) return m_activity; return m_service; } |