From e3b91f26355ce928b748b3eabe8b5b9074acc347 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Thu, 8 Oct 2015 01:41:52 +0200 Subject: [PATCH] Fix bug causing Google Maps to die when navigation is started --- extern/GmsApi | 2 +- .../microg/gms/location/GoogleLocationManagerServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extern/GmsApi b/extern/GmsApi index c43a964c..594fb004 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit c43a964cb196f7a30888216dedcd812386c867be +Subproject commit 594fb004b7ceac5cf5d9f69bdc0809f3ca106fd7 diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java index 72ca9a1f..7b318994 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java @@ -34,6 +34,7 @@ import com.google.android.gms.location.LocationAvailability; import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationSettingsRequest; import com.google.android.gms.location.LocationSettingsResult; +import com.google.android.gms.location.LocationSettingsStates; import com.google.android.gms.location.internal.IGeofencerCallbacks; import com.google.android.gms.location.internal.IGoogleLocationManagerService; import com.google.android.gms.location.internal.ISettingsCallbacks; @@ -294,7 +295,7 @@ public class GoogleLocationManagerServiceImpl extends IGoogleLocationManagerServ @Override public void requestLocationSettingsDialog(LocationSettingsRequest settingsRequest, ISettingsCallbacks callback, String packageName) throws RemoteException { Log.d(TAG, "requestLocationSettingsDialog: " + settingsRequest); - callback.onLocationSettingsResult(new LocationSettingsResult(Status.CANCELED)); + callback.onLocationSettingsResult(new LocationSettingsResult(new LocationSettingsStates(true, true, false, true, true, false), Status.CANCELED)); } @Override