summaryrefslogtreecommitdiffstats
path: root/tests/CoreTests
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-07 10:35:09 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-07 10:35:09 -0700
commitf9189f17d14a69145c6603b9eb5c5e00f55ea21a (patch)
treed7008400522e4cc8b843e6b4bdf7e4bb03b71bc9 /tests/CoreTests
parent04f7e416b8259f3d61fe34fa637d3608c086e00f (diff)
parent08d00b9ad794d9f627f1c2c4b282c3950806f4bd (diff)
downloadframeworks_base-f9189f17d14a69145c6603b9eb5c5e00f55ea21a.zip
frameworks_base-f9189f17d14a69145c6603b9eb5c5e00f55ea21a.tar.gz
frameworks_base-f9189f17d14a69145c6603b9eb5c5e00f55ea21a.tar.bz2
am 08d00b9: Merge change 1159 into donut
Merge commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd' * commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd': CoreTests: Fix LocationManagerProximityTest.
Diffstat (limited to 'tests/CoreTests')
-rw-r--r--tests/CoreTests/android/location/LocationManagerProximityTest.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/CoreTests/android/location/LocationManagerProximityTest.java b/tests/CoreTests/android/location/LocationManagerProximityTest.java
index e1501e3..3f43bcf 100644
--- a/tests/CoreTests/android/location/LocationManagerProximityTest.java
+++ b/tests/CoreTests/android/location/LocationManagerProximityTest.java
@@ -52,11 +52,7 @@ public class LocationManagerProximityTest extends AndroidTestCase {
private static final String LOG_TAG = "LocationProximityTest";
- // use network provider as mock location provider, because:
- // - proximity alert is hardcoded to listen to only network or gps
- // - 'network' provider is not installed in emulator, so can mock it
- // using test provider APIs
- private static final String PROVIDER_NAME = LocationManager.NETWORK_PROVIDER;
+ private static final String PROVIDER_NAME = "test";
@Override
protected void setUp() throws Exception {
@@ -84,6 +80,7 @@ public class LocationManagerProximityTest extends AndroidTestCase {
false, // upportsBearing,
Criteria.POWER_MEDIUM, // powerRequirement
Criteria.ACCURACY_FINE); // accuracy
+ mLocationManager.setTestProviderEnabled(PROVIDER_NAME, true);
}
@Override