diff --git a/location/java/com/android/internal/location/GpsLocationProvider.java b/location/java/com/android/internal/location/GpsLocationProvider.java
index 134756e..1fe3d05 100755
--- a/location/java/com/android/internal/location/GpsLocationProvider.java
+++ b/location/java/com/android/internal/location/GpsLocationProvider.java
@@ -885,6 +885,7 @@
             switch (status) {
                 case GPS_STATUS_SESSION_BEGIN:
                     mNavigating = true;
+                    mEngineOn = true;
                     break;
                 case GPS_STATUS_SESSION_END:
                     mNavigating = false;
@@ -894,6 +895,7 @@
                     break;
                 case GPS_STATUS_ENGINE_OFF:
                     mEngineOn = false;
+                    mNavigating = false;
                     break;
             }