From d5b87c4c01b81764f2f2fa4794c3df8560f800ea Mon Sep 17 00:00:00 2001
From: Vyacheslav Koscheev <v.koscheev@2gis.ru>
Date: Thu, 29 Jun 2017 12:00:43 +0700
Subject: Android: fix resolving null locationManager

Change-Id: I5be4c3af8cedd6755296bc9b445562549784c050
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 .../jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java  | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

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++) {
-- 
cgit v1.2.1