Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca2ef2cb authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "Fix style for Geolocation mock mechanism"

parents bb68d6f8 b56ed306

core/java/android/webkit/MockGeolocation.java

+4 −9
Original line number Diff line number Diff line
@@ -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);

}

tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -541,8 +541,7 @@ public class TestShellActivity extends Activity implements LayoutTestController 


    @Override

    public void setMockGeolocationPosition(double latitude, double longitude, double accuracy) {

        WebViewClassic.fromWebView(mWebView).setMockGeolocationPosition(latitude,

                                                                        longitude,

        WebViewClassic.fromWebView(mWebView).setMockGeolocationPosition(latitude, longitude,

                accuracy);

    }

tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestController.java

+3 −7
Original line number Diff line number Diff line
@@ -80,14 +80,10 @@ 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) {

tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java

+2 −3
Original line number Diff line number Diff line
@@ -694,8 +694,7 @@ public class LayoutTestsExecutor extends Activity { 
    }



    public void setMockGeolocationPosition(double latitude, double longitude, double accuracy) {

        WebViewClassic.fromWebView(mCurrentWebView).setMockGeolocationPosition(latitude,

                                                                        longitude,

        WebViewClassic.fromWebView(mCurrentWebView).setMockGeolocationPosition(latitude, longitude,

                accuracy);

    }