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

Commit df52307e authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by android-build-merger
Browse files

Merge "Clarify WebView's lack of plugin support." into pi-dev 

am: 36362afd

Change-Id: Ib3cb10a113822e25115862a883c73f07ccccfa99
parents 2e0ed252 36362afd

core/java/android/webkit/WebSettings.java

+6 −2
Original line number Diff line number Diff line
@@ -987,7 +987,9 @@ public abstract class WebSettings { 
     * {@link PluginState#OFF}.

     *

     * @param state a PluginState value

     * @deprecated Plugins will not be supported in future, and should not be used.

     * @deprecated Plugins are not supported in API level

     *             {@link android.os.Build.VERSION_CODES#KITKAT} or later;

     *             enabling plugins is a no-op.

     */

    @Deprecated

    public abstract void setPluginState(PluginState state);
@@ -1182,7 +1184,9 @@ public abstract class WebSettings { 
     *

     * @return the plugin state as a {@link PluginState} value

     * @see #setPluginState

     * @deprecated Plugins will not be supported in future, and should not be used.

     * @deprecated Plugins are not supported in API level

     *             {@link android.os.Build.VERSION_CODES#KITKAT} or later;

     *             enabling plugins is a no-op.

     */

    @Deprecated

    public abstract PluginState getPluginState();