Merge change 403 into donut
* changes:
remove superfluous lines
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 83108f8..5e079d4 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1584,10 +1584,7 @@
return;
}
- // Process the location fix if we're holding a wakelock
- if (mWakeLockAcquireTime != 0) {
- handleLocationChangedLocked(location);
- }
+ handleLocationChangedLocked(location);
if ((mWakeLockAcquireTime != 0) &&
(SystemClock.elapsedRealtime() - mWakeLockAcquireTime