Merge "Prevent startNavigating() call when GPS is off" into nyc-dev

2016-06-21 21:47:25 +00:00
parent 7595478ff2 260d667b27
commit 472224cd81
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -1192,7 +1192,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
        }

        if (DEBUG) Log.d(TAG, "setRequest " + mProviderRequest);
-        if (mProviderRequest.reportLocation && !mDisableGps) {
+        if (mProviderRequest.reportLocation && !mDisableGps && isEnabled()) {
            // update client uids
            updateClientUids(mWorkSource);