Merge "Fix a couple of bugs from the location overhaul." into jb-mr1-dev

2012-08-10 17:19:09 -07:00
parent 0e545e24f0 08ca1046fe
commit 75f0fac91b
5 changed files with 13 additions and 14 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -787,10 +787,6 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs
            for (UpdateRecord record : records) {
                LocationRequest locationRequest = record.mRequest;

-                if (providerRequest.locationRequests == null) {
-                    providerRequest.locationRequests = new ArrayList<LocationRequest>();
-                }
-
                providerRequest.locationRequests.add(locationRequest);
                if (locationRequest.getInterval() < providerRequest.interval) {
                    providerRequest.reportLocation = true;