summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-10-08 15:10:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-08 15:10:25 -0700
commita4f6c96f1acb4f0e7aaa233c2a5b884aaac2f573 (patch)
treed7221d613fb582bf9b5541afcd25aaa1f6e9814e /test-runner
parent935c3eb25b0c98fa18bad36c1f21f10b296f9387 (diff)
parent348b92bd513087369ac682e29620d7829fa1381b (diff)
downloadframeworks_base-a4f6c96f1acb4f0e7aaa233c2a5b884aaac2f573.zip
frameworks_base-a4f6c96f1acb4f0e7aaa233c2a5b884aaac2f573.tar.gz
frameworks_base-a4f6c96f1acb4f0e7aaa233c2a5b884aaac2f573.tar.bz2
am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp * commit '348b92bd513087369ac682e29620d7829fa1381b': GPS: Fix problem with SUPL when SUPL APN is already active.
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/android/test/TestLocationProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/test-runner/android/test/TestLocationProvider.java b/test-runner/android/test/TestLocationProvider.java
index 2ea020e..dc07585 100644
--- a/test-runner/android/test/TestLocationProvider.java
+++ b/test-runner/android/test/TestLocationProvider.java
@@ -22,6 +22,7 @@ import android.location.ILocationManager;
import android.location.ILocationProvider;
import android.location.Location;
import android.location.LocationProvider;
+import android.net.NetworkInfo;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.SystemClock;
@@ -156,7 +157,7 @@ public class TestLocationProvider extends ILocationProvider.Stub {
public void setMinTime(long minTime) {
}
- public void updateNetworkState(int state) {
+ public void updateNetworkState(int state, NetworkInfo info) {
}
public void updateLocation(Location location) {