[TIMOB-20522] Improve validation

tidev · Feb 21, 2018 · 9712e59 · 9712e59
1 parent 61e58ad
commit 9712e59
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...s/geolocation/src/java/ti/modules/titanium/geolocation/android/FusedLocationProvider.java b/...s/geolocation/src/java/ti/modules/titanium/geolocation/android/FusedLocationProvider.java
@@ -179,9 +179,12 @@ public static boolean validVersion()
 
 		public static boolean available(Context context)
 		{
-			googleApiCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
-			if (googleApiCode == ConnectionResult.SUCCESS) {
-				return true;
+			GoogleApiAvailability availability = GoogleApiAvailability.getInstance();
+			if (availability != null) {
+				googleApiCode = availability.isGooglePlayServicesAvailable(context);
+				if (googleApiCode == ConnectionResult.SUCCESS) {
+					return true;
+				}
 			}
 
 			Log.w(TAG, "Google Play Services is not available");