Decrement number of updates in LocationRequest

Decrement the number of updates after a location fix has been sent to a
a listener. This is necessary for respecting calls such as
requestSingleUpdate().

Bug: 7460868
Change-Id: Iea207ab494b93b936ca434d59652bb2cb6404cef

Author: laurenttu

services/java/com/android/server/LocationManagerService.java

@@ -224,7 +224,7 @@ private void init() {
 
         // listen for settings changes
         mContext.getContentResolver().registerContentObserver(
-                Settings.Secure.getUriFor(Settings.Secure.LOCATION_PROVIDERS_ALLOWED), true, 
+                Settings.Secure.getUriFor(Settings.Secure.LOCATION_PROVIDERS_ALLOWED), true,
                 new ContentObserver(mLocationHandler) {
            @Override
             public void onChange(boolean selfChange) {
@@ -1540,7 +1540,8 @@ public void reportLocation(Location location, boolean passive) {
     }
 
 
-    private static boolean shouldBroadcastSafe(Location loc, Location lastLoc, UpdateRecord record) {
+    private static boolean shouldBroadcastSafe(
+            Location loc, Location lastLoc, UpdateRecord record, long now) {
         // Always broadcast the first update
         if (lastLoc == null) {
             return true;
@@ -1561,6 +1562,16 @@ private static boolean shouldBroadcastSafe(Location loc, Location lastLoc, Updat
             }
         }
 
+        // Check whether sufficient number of udpates is left
+        if (record.mRequest.getNumUpdates() <= 0) {
+            return false;
+        }
+
+        // Check whether the expiry date has passed
+        if (record.mRequest.getExpireAt() < now) {
+            return false;
+        }
+
         return true;
     }
 
@@ -1640,7 +1651,7 @@ private void handleLocationChangedLocked(Location location, boolean passive) {
             }
             if (notifyLocation != null) {
                 Location lastLoc = r.mLastFixBroadcast;
-                if ((lastLoc == null) || shouldBroadcastSafe(notifyLocation, lastLoc, r)) {
+                if ((lastLoc == null) || shouldBroadcastSafe(notifyLocation, lastLoc, r, now)) {
                     if (lastLoc == null) {
                         lastLoc = new Location(notifyLocation);
                         r.mLastFixBroadcast = lastLoc;
@@ -1651,6 +1662,7 @@ private void handleLocationChangedLocked(Location location, boolean passive) {
                         Slog.w(TAG, "RemoteException calling onLocationChanged on " + receiver);
                         receiverDead = true;
                     }
+                    r.mRequest.decrementNumUpdates();
                 }
             }
 
@@ -1666,7 +1678,7 @@ private void handleLocationChangedLocked(Location location, boolean passive) {
             }
 
             // track expired records
-            if (r.mRequest.getNumUpdates() == 0 || r.mRequest.getExpireAt() < now) {
+            if (r.mRequest.getNumUpdates() <= 0 || r.mRequest.getExpireAt() < now) {
                 if (deadUpdateRecords == null) {
                     deadUpdateRecords = new ArrayList<UpdateRecord>();
                 }