diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:56 +0200 |
| commit | 40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7 (patch) | |
| tree | 0ad7002074b2996460d72722435c97d76ddc6466 /src/plugins/position | |
| parent | 420139a36dace3bb8f78f2d65b30f7657668d888 (diff) | |
| parent | 5542c721af400750b13bd411dfbb13891f49618e (diff) | |
| download | qtlocation-40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
Diffstat (limited to 'src/plugins/position')
| -rw-r--r-- | src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java b/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java index b55a90d4..edc39bd7 100644 --- a/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java +++ b/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java @@ -110,6 +110,10 @@ public class QtPositioning implements LocationListener static private int[] providerList() { + if (locationManager == null) { + Log.w(TAG, "No locationManager available in QtPositioning"); + return new int[0]; + } List<String> providers = locationManager.getAllProviders(); int retList[] = new int[providers.size()]; for (int i = 0; i < providers.size(); i++) { |