diff options
| author | Vyacheslav Koscheev <v.koscheev@2gis.ru> | 2017-06-29 12:00:43 +0700 |
|---|---|---|
| committer | Vyacheslav Koscheev <vok1980@gmail.com> | 2017-06-29 11:26:46 +0000 |
| commit | d5b87c4c01b81764f2f2fa4794c3df8560f800ea (patch) | |
| tree | 899798a351e1b838fce582cd9230ea4e457b51c1 | |
| parent | cd3c7500af087d9289382b669067a824f019c27e (diff) | |
| download | qtlocation-d5b87c4c01b81764f2f2fa4794c3df8560f800ea.tar.gz | |
Android: fix resolving null locationManager
Change-Id: I5be4c3af8cedd6755296bc9b445562549784c050
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -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++) { |