Attempt to deflake WebVie Gelocation tests.
Don't attempt to override the LocationManager.NETWORK_PROVIDER
location provider.
Bug: 8208948
Change-Id: Icf79aa181e80e5a786d585617796c6b241e5ed47
diff --git a/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java b/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
index f6f133a..d774fec 100644
--- a/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
@@ -64,6 +64,7 @@
private static final String JS_INTERFACE_NAME = "Android";
private static final int POLLING_TIMEOUT = 2000;
+ private static final String PROVIDER_NAME = "WebKitGeolocationTestLocationProvider";
// static HTML page always injected instead of the url loaded
private static final String RAW_HTML =
@@ -150,14 +151,14 @@
mLocationManager = (LocationManager)getActivity().getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
// Add a test provider before each test to inject a location
- addTestProvider(LocationManager.NETWORK_PROVIDER);
+ addTestProvider(PROVIDER_NAME);
}
@Override
protected void tearDown() throws Exception {
// Remove the test provider after each test
try {
- mLocationManager.removeTestProvider(LocationManager.NETWORK_PROVIDER);
+ mLocationManager.removeTestProvider(PROVIDER_NAME);
} catch (IllegalArgumentException e) {} // Not much to do about this
mOnUiThread.cleanUp();
// This will null all member and static variables
@@ -179,7 +180,7 @@
// using a maximum age.
private void loadUrlAndUpdateLocation(String url) {
mOnUiThread.loadUrlAndWaitForCompletion(url);
- updateLocation(LocationManager.NETWORK_PROVIDER);
+ updateLocation(PROVIDER_NAME);
}
// WebChromeClient that accepts each location for one load. WebChromeClient is used in
