From 617416c922a5a5161c59537edd5faf1cfc0da8b0 Mon Sep 17 00:00:00 2001 From: Ankit Shah Date: Fri, 19 Feb 2016 00:46:38 -0500 Subject: [PATCH] Bumping up sdk --- app/build.gradle | 2 +- .../main/java/com/mhacks/android/ui/map/MapViewFragment.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b7cdc907..64d1c3a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { applicationId "org.mhacks.android" - minSdkVersion 15 + minSdkVersion 17 targetSdkVersion 23 versionCode((int) (System.currentTimeMillis() / 1000)) versionName "6.0.1" diff --git a/app/src/main/java/com/mhacks/android/ui/map/MapViewFragment.java b/app/src/main/java/com/mhacks/android/ui/map/MapViewFragment.java index e41abb6a..c401e978 100644 --- a/app/src/main/java/com/mhacks/android/ui/map/MapViewFragment.java +++ b/app/src/main/java/com/mhacks/android/ui/map/MapViewFragment.java @@ -2,6 +2,7 @@ import android.app.Fragment; import android.app.FragmentManager; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.annotation.Nullable; @@ -164,7 +165,9 @@ public void onMapReady(GoogleMap map){ gMap.getUiSettings().setMyLocationButtonEnabled(true); //TODO: stop it from complaining about disabled permissions - gMap.setMyLocationEnabled(true); + if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) { + gMap.setMyLocationEnabled(true); + } } @Override