summaryrefslogtreecommitdiffstats
path: root/location/java/android
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-04-29 13:35:22 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-29 13:35:22 -0700
commit093dda9dec68029278cdf28b2a2d92bc5cdedcbc (patch)
tree59d92542c9cb0ffd562ad67504405088a6872a07 /location/java/android
parentd7047b0ca1c42ef7519aede116f7a2ee2b03595a (diff)
parent5fa153302c1c7f179bfd6ddd301e7526b8c06de5 (diff)
downloadframeworks_base-093dda9dec68029278cdf28b2a2d92bc5cdedcbc.zip
frameworks_base-093dda9dec68029278cdf28b2a2d92bc5cdedcbc.tar.gz
frameworks_base-093dda9dec68029278cdf28b2a2d92bc5cdedcbc.tar.bz2
am 5fa1533: Merge change 482 into donut
Merge commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5' * commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5': location: Location Manager wakelock cleanup, phase 2
Diffstat (limited to 'location/java/android')
-rw-r--r--location/java/android/location/ILocationManager.aidl5
-rw-r--r--location/java/android/location/LocationManager.java5
2 files changed, 9 insertions, 1 deletions
diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl
index 7d35814..096622a 100644
--- a/location/java/android/location/ILocationManager.aidl
+++ b/location/java/android/location/ILocationManager.aidl
@@ -45,7 +45,10 @@ interface ILocationManager
boolean addGpsStatusListener(IGpsStatusListener listener);
void removeGpsStatusListener(IGpsStatusListener listener);
-
+
+ // for reporting callback completion
+ void locationCallbackFinished(ILocationListener listener);
+
boolean sendExtraCommand(String provider, String command, inout Bundle extras);
void addProximityAlert(double latitude, double longitude, float distance,
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 0c7254e..f587f96 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -194,6 +194,11 @@ public class LocationManager {
mListener.onProviderDisabled((String) msg.obj);
break;
}
+ try {
+ mService.locationCallbackFinished(this);
+ } catch (RemoteException e) {
+ Log.e(TAG, "locationCallbackFinished: RemoteException", e);
+ }
}
}
/**