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

Commit 27c6f7d4 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread 

Merge commit '1614843e' into gingerbread-plus-aosp

* commit '1614843e':
  Fix invalid comment in WebSettings.
parents 036b3157 1614843e

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -203601,7 +203601,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -204149,7 +204149,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="pluginsPath" type="java.lang.String">

core/java/android/webkit/WebSettings.java

+10 −2
Original line number Diff line number Diff line
@@ -1048,7 +1048,11 @@ public class WebSettings { 
    }



    /**

     * TODO: need to add @Deprecated

     * Set a custom path to plugins used by the WebView. This method is

     * obsolete since each plugin is now loaded from its own package.

     * @param pluginsPath String path to the directory containing plugins.

     * @deprecated This method is no longer used as plugins are loaded from

     * their own APK via the system's package manager.

     */

    public synchronized void setPluginsPath(String pluginsPath) {

    }
@@ -1219,7 +1223,11 @@ public class WebSettings { 
    }



    /**

     * TODO: need to add @Deprecated

     * Returns the directory that contains the plugin libraries. This method is

     * obsolete since each plugin is now loaded from its own package.

     * @return An empty string.

     * @deprecated This method is no longer used as plugins are loaded from

     * their own APK via the system's package manager.

     */

    public synchronized String getPluginsPath() {

        return "";