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

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

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

Merge commit '27c6f7d4'

* commit '27c6f7d4':
  Fix invalid comment in WebSettings.
parents 1b1c9a2e 27c6f7d4

api/current.xml

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

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -214274,7 +214274,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
@@ -1102,7 +1102,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) {

    }
@@ -1286,7 +1290,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 "";