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

Commit 68770066 authored by Jonathan Dixon's avatar Jonathan Dixon Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc build" into jb-mr2-dev

parents e70e8bec 98fac170

core/java/android/webkit/WebIconDatabase.java

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.graphics.Bitmap; 
 * and WebView.getIconDatabase() will return a WebIconDatabase object. This

 * WebIconDatabase object is a single instance and all methods operate on that

 * single object.

 * The main use-case for this class is calling {@link WebIconDatabase#open()}

 * The main use-case for this class is calling {@link #open}

 * to enable favicon functionality on all WebView instances in this process.

 *

 * @deprecated This class is only required when running on devices
@@ -35,7 +35,7 @@ import android.graphics.Bitmap; 
public class WebIconDatabase {

    /**

     * Interface for receiving icons from the database.

     * @deprecated

     * @deprecated This interface is obsolete.

     */

    @Deprecated

    public interface IconListener {

core/java/android/webkit/WebSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ public abstract class WebSettings { 
    /**

     * Gets whether light touches are enabled.

     * @see #setLightTouchEnabled

     * @deprecated

     * @deprecated This setting is obsolete.

     */

    @Deprecated

    public boolean getLightTouchEnabled() {