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

Commit 15c5a50b authored by Hui Shu's avatar Hui Shu Committed by Android (Google) Code Review
Browse files

Merge "Deprecate setGeolocationDatabasePath because it is no-op since KitKat"

parents f34113f4 89eb9b45

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44052,7 +44052,7 @@ package android.webkit { 
    method public abstract deprecated void setEnableSmoothTransition(boolean);

    method public abstract void setFantasyFontFamily(java.lang.String);

    method public abstract void setFixedFontFamily(java.lang.String);

    method public abstract void setGeolocationDatabasePath(java.lang.String);

    method public abstract deprecated void setGeolocationDatabasePath(java.lang.String);

    method public abstract void setGeolocationEnabled(boolean);

    method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean);

    method public abstract void setJavaScriptEnabled(boolean);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -46470,7 +46470,7 @@ package android.webkit { 
    method public abstract deprecated void setEnableSmoothTransition(boolean);

    method public abstract void setFantasyFontFamily(java.lang.String);

    method public abstract void setFixedFontFamily(java.lang.String);

    method public abstract void setGeolocationDatabasePath(java.lang.String);

    method public abstract deprecated void setGeolocationDatabasePath(java.lang.String);

    method public abstract void setGeolocationEnabled(boolean);

    method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean);

    method public abstract void setJavaScriptEnabled(boolean);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44068,7 +44068,7 @@ package android.webkit { 
    method public abstract deprecated void setEnableSmoothTransition(boolean);

    method public abstract void setFantasyFontFamily(java.lang.String);

    method public abstract void setFixedFontFamily(java.lang.String);

    method public abstract void setGeolocationDatabasePath(java.lang.String);

    method public abstract deprecated void setGeolocationDatabasePath(java.lang.String);

    method public abstract void setGeolocationEnabled(boolean);

    method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean);

    method public abstract void setJavaScriptEnabled(boolean);

core/java/android/webkit/WebSettings.java

+3 −6
Original line number Diff line number Diff line
@@ -987,9 +987,6 @@ public abstract class WebSettings { 
     * @deprecated Database paths are managed by the implementation and calling this method

     *             will have no effect.

     */

    // This will update WebCore when the Sync runs in the C++ side.

    // Note that the WebCore Database Tracker only allows the path to be set

    // once.

    @Deprecated

    public abstract void setDatabasePath(String databasePath);
@@ -1000,8 +997,10 @@ public abstract class WebSettings { 
     *

     * @param databasePath a path to the directory where databases should be

     *                     saved.

     * @deprecated Geolocation database are managed by the implementation and calling this method

     *             will have no effect.

     */

    // This will update WebCore when the Sync runs in the C++ side.

    @Deprecated

    public abstract void setGeolocationDatabasePath(String databasePath);



    /**
@@ -1102,8 +1101,6 @@ public abstract class WebSettings { 
     *   via the JavaScript Geolocation API.

     * </ul>

     * <p>

     * As an option, it is possible to store previous locations and web origin

     * permissions in a database. See {@link #setGeolocationDatabasePath}.

     *

     * @param flag whether Geolocation should be enabled

     */