diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-19 01:19:15 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-19 01:19:15 -0700 |
| commit | 8ba63601ab3aa4042f8801529cb629450aea4bc3 (patch) | |
| tree | 21f1ee7714358f561357dc30bf07de926ab358e7 /tests | |
| parent | 402b24c6722329cfbc0443082828a2a89930c199 (diff) | |
| parent | 15e74b9da8b4cda11ee54da1e77a02d1a86c944a (diff) | |
| download | frameworks_base-8ba63601ab3aa4042f8801529cb629450aea4bc3.zip frameworks_base-8ba63601ab3aa4042f8801529cb629450aea4bc3.tar.gz frameworks_base-8ba63601ab3aa4042f8801529cb629450aea4bc3.tar.bz2 | |
am 15e74b9d: Merge change 1939 into donut
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'
* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
Fix build breakage
Revise the ImageButton class description to include information
Record statistics about whether HTTP connections are reused.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CoreTests/android/location/LocationManagerProximityTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/CoreTests/android/location/LocationManagerProximityTest.java b/tests/CoreTests/android/location/LocationManagerProximityTest.java index 3f43bcf..e82d878 100644 --- a/tests/CoreTests/android/location/LocationManagerProximityTest.java +++ b/tests/CoreTests/android/location/LocationManagerProximityTest.java @@ -26,6 +26,7 @@ import android.location.LocationManager; import android.provider.Settings; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.Suppress; import android.util.Log; /** @@ -37,9 +38,11 @@ import android.util.Log; * adb shell am instrument -e class android.location.LocationManagerProximityTest \ * -w android.core/android.test.InstrumentationTestRunner * - * This test requires that the "Allow mock locations" setting be enabled + * This test requires that the "Allow mock locations" setting be enabled. + * To ensure reliable results, all location providers should be disabled. * */ +@Suppress @MediumTest public class LocationManagerProximityTest extends AndroidTestCase { |