diff options
4 files changed, 11 insertions, 22 deletions
diff --git a/core/java/android/webkit/MockGeolocation.java b/core/java/android/webkit/MockGeolocation.java index d8dc724..885c6c2 100644 --- a/core/java/android/webkit/MockGeolocation.java +++ b/core/java/android/webkit/MockGeolocation.java @@ -57,13 +57,8 @@ public final class MockGeolocation { // Native functions private static native void nativeSetUseMock(WebViewCore webViewCore); - private static native void nativeSetPosition(WebViewCore webViewCore, - double latitude, - double longitude, - double accuracy); - private static native void nativeSetError(WebViewCore webViewCore, - int code, - String message); - private static native void nativeSetPermission(WebViewCore webViewCore, - boolean allow); + private static native void nativeSetPosition(WebViewCore webViewCore, double latitude, + double longitude, double accuracy); + private static native void nativeSetError(WebViewCore webViewCore, int code, String message); + private static native void nativeSetPermission(WebViewCore webViewCore, boolean allow); } diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 2b58f14..42d6457 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -541,9 +541,8 @@ public class TestShellActivity extends Activity implements LayoutTestController @Override public void setMockGeolocationPosition(double latitude, double longitude, double accuracy) { - WebViewClassic.fromWebView(mWebView).setMockGeolocationPosition(latitude, - longitude, - accuracy); + WebViewClassic.fromWebView(mWebView).setMockGeolocationPosition(latitude, longitude, + accuracy); } @Override diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java index bb3bf62..c9c35ce 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java @@ -80,20 +80,16 @@ public class LayoutTestController { quota); } - public void setMockGeolocationPosition(double latitude, - double longitude, - double accuracy) { + public void setMockGeolocationPosition(double latitude, double longitude, double accuracy) { Log.i(LOG_TAG, "setMockGeolocationPosition(): " + "latitude=" + latitude + " longitude=" + longitude + " accuracy=" + accuracy); - mLayoutTestsExecutor.setMockGeolocationPosition(latitude, - longitude, - accuracy); + mLayoutTestsExecutor.setMockGeolocationPosition(latitude, longitude, accuracy); } public void setMockGeolocationError(int code, String message) { Log.i(LOG_TAG, "setMockGeolocationError(): " + "code=" + code + " message=" + message); mLayoutTestsExecutor.setMockGeolocationError(code, message); - } + } public void setGeolocationPermission(boolean allow) { mLayoutTestsExecutor.setGeolocationPermission(allow); diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java index b2fbfd5..25ac700 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java @@ -694,9 +694,8 @@ public class LayoutTestsExecutor extends Activity { } public void setMockGeolocationPosition(double latitude, double longitude, double accuracy) { - WebViewClassic.fromWebView(mCurrentWebView).setMockGeolocationPosition(latitude, - longitude, - accuracy); + WebViewClassic.fromWebView(mCurrentWebView).setMockGeolocationPosition(latitude, longitude, + accuracy); } public void setMockGeolocationError(int code, String message) { |