Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 25519 into eclair

Browse Source 
* changes:
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
This commit is contained in:
Android (Google) Code Review
2009-09-17 13:58:20 -04:00
parent 70db3a20cf 2d2078aa1d
commit 6c41feadc3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/LocationManagerService.java
View File

@@ -1069,13 +1069,13 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
return mIntent;
}
boolean isInProximity(double latitude, double longitude) {
boolean isInProximity(double latitude, double longitude, float accuracy) {
Location loc = new Location("");
loc.setLatitude(latitude);
loc.setLongitude(longitude);
double radius = loc.distanceTo(mLocation);
return radius <= mRadius;
return radius <= Math.max(mRadius,accuracy);
}
@Override
@@ -1115,6 +1115,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
long now = System.currentTimeMillis();
double latitude = loc.getLatitude();
double longitude = loc.getLongitude();
float accuracy = loc.getAccuracy();
ArrayList<PendingIntent> intentsToRemove = null;
for (ProximityAlert alert : mProximityAlerts.values()) {
@@ -1124,7 +1125,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
if ((expiration == -1) || (now <= expiration)) {
boolean entered = mProximitiesEntered.contains(alert);
boolean inProximity =
alert.isInProximity(latitude, longitude);
alert.isInProximity(latitude, longitude, accuracy);
if (!entered && inProximity) {
if (LOCAL_LOGV) {
Log.v(TAG, "Entered alert");