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

Commit 40668315 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android (Google) Code Review
Browse files

Merge "Deprecate WebChromeClient.onJsTimeout"

parents 4478790b 1bd37b17

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26252,7 +26252,7 @@ package android.webkit { 
    method public boolean onJsBeforeUnload(android.webkit.WebView, java.lang.String, java.lang.String, android.webkit.JsResult);

    method public boolean onJsConfirm(android.webkit.WebView, java.lang.String, java.lang.String, android.webkit.JsResult);

    method public boolean onJsPrompt(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String, android.webkit.JsPromptResult);

    method public boolean onJsTimeout();

    method public deprecated boolean onJsTimeout();

    method public void onProgressChanged(android.webkit.WebView, int);

    method public void onReachedMaxAppCacheSize(long, long, android.webkit.WebStorage.QuotaUpdater);

    method public void onReceivedIcon(android.webkit.WebView, android.graphics.Bitmap);

core/java/android/webkit/WebChromeClient.java

+5 −0
Original line number Diff line number Diff line
@@ -297,7 +297,12 @@ public class WebChromeClient { 
     * will continue to occur if the script does not finish at the next check

     * point.

     * @return boolean Whether the JavaScript execution should be interrupted.

     * @deprecated This method is no longer supported and will not be invoked.

     */

    // This method was only called when using the JSC javascript engine. V8 became

    // the default JS engine with Froyo and support for building with JSC was

    // removed in b/5495373. V8 does not have a mechanism for making a callback such

    // as this.

    public boolean onJsTimeout() {

        return true;

    }