diff options
| -rw-r--r-- | services/core/java/com/android/server/location/provider/LocationProviderManager.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java index 72ab8c1e2d1a..f7c4d03bfdf3 100644 --- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java +++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java @@ -911,18 +911,21 @@ public class LocationProviderManager extends @Override public void onPreExecute() { mUseWakeLock = false; - final int size = locationResult.size(); - for (int i = 0; i < size; ++i) { - if (!locationResult.get(i).isMock()) { - mUseWakeLock = true; - break; + + // don't acquire a wakelock for passive requests or for mock locations + if (getRequest().getIntervalMillis() != LocationRequest.PASSIVE_INTERVAL) { + final int size = locationResult.size(); + for (int i = 0; i < size; ++i) { + if (!locationResult.get(i).isMock()) { + mUseWakeLock = true; + break; + } } } // update last delivered location setLastDeliveredLocation(locationResult.getLastLocation()); - // don't acquire a wakelock for mock locations to prevent abuse if (mUseWakeLock) { mWakeLock.acquire(WAKELOCK_TIMEOUT_MS); } |