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

Commit 2df9a91f authored by Grace Kloba's avatar Grace Kloba
Browse files

Hide the android.webkit.CallbackProxy class from the API. This is a... 

Hide the android.webkit.CallbackProxy class from the API. This is a android.webkit package class and internal to our implementation.

Although not strictly a published API (the class does not appear in the docs), it has found it's way into the API through
the public, subclassable android.webkit.JsResult class where it is a protected member.

Based on changed from Ben.
parent 3565456c

api/8.xml

+0 −577
Original line number Diff line number Diff line
@@ -173386,573 +173386,6 @@ 
</parameter>

</method>

</class>

<class name="CallbackProxy"

 extends="android.os.Handler"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility=""

>

<constructor name="CallbackProxy"

 type="android.webkit.CallbackProxy"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="w" type="android.webkit.WebView">

</parameter>

</constructor>

<method name="addMessageToConsole"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="lineNumber" type="int">

</parameter>

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

</parameter>

</method>

<method name="createWindow"

 return="android.webkit.WebView"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dialog" type="boolean">

</parameter>

<parameter name="userGesture" type="boolean">

</parameter>

</method>

<method name="doUpdateVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="isReload" type="boolean">

</parameter>

</method>

<method name="getBackForwardList"

 return="android.webkit.WebBackForwardList"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getProgress"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

</parameter>

</method>

<method name="getWebChromeClient"

 return="android.webkit.WebChromeClient"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onCloseWindow"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="window" type="android.webkit.WebView">

</parameter>

</method>

<method name="onDownloadStart"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

<parameter name="contentLength" type="long">

</parameter>

</method>

<method name="onExceededDatabaseQuota"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

<parameter name="currentQuota" type="long">

</parameter>

<parameter name="estimatedSize" type="long">

</parameter>

<parameter name="totalUsedQuota" type="long">

</parameter>

<parameter name="quotaUpdater" type="android.webkit.WebStorage.QuotaUpdater">

</parameter>

</method>

<method name="onFormResubmission"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dontResend" type="android.os.Message">

</parameter>

<parameter name="resend" type="android.os.Message">

</parameter>

</method>

<method name="onGeolocationPermissionsHidePrompt"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onGeolocationPermissionsShowPrompt"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="callback" type="android.webkit.GeolocationPermissions.Callback">

</parameter>

</method>

<method name="onJsAlert"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="onJsBeforeUnload"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="onJsConfirm"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="onJsPrompt"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="onJsTimeout"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onLoadResource"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="onPageFinished"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="onPageStarted"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="favicon" type="android.graphics.Bitmap">

</parameter>

</method>

<method name="onProgressChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="newProgress" type="int">

</parameter>

</method>

<method name="onReachedMaxAppCacheSize"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="spaceNeeded" type="long">

</parameter>

<parameter name="totalUsedQuota" type="long">

</parameter>

<parameter name="quotaUpdater" type="android.webkit.WebStorage.QuotaUpdater">

</parameter>

</method>

<method name="onReceivedError"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="errorCode" type="int">

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="onReceivedHttpAuthRequest"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="handler" type="android.webkit.HttpAuthHandler">

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="onReceivedIcon"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

</method>

<method name="onReceivedTitle"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="onRequestFocus"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onSavePassword"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

<parameter name="resumeMsg" type="android.os.Message">

</parameter>

</method>

<method name="onScaleChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="oldScale" type="float">

</parameter>

<parameter name="newScale" type="float">

</parameter>

</method>

<method name="onTooManyRedirects"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cancelMsg" type="android.os.Message">

</parameter>

<parameter name="continueMsg" type="android.os.Message">

</parameter>

</method>

<method name="onUnhandledKeyEvent"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="event" type="android.view.KeyEvent">

</parameter>

</method>

<method name="setDownloadListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="client" type="android.webkit.DownloadListener">

</parameter>

</method>

<method name="setWebChromeClient"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="client" type="android.webkit.WebChromeClient">

</parameter>

</method>

<method name="setWebViewClient"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="client" type="android.webkit.WebViewClient">

</parameter>

</method>

<method name="shouldOverrideUrlLoading"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="uiOverrideKeyEvent"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="event" type="android.view.KeyEvent">

</parameter>

</method>

<method name="uiOverrideUrlLoading"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

</class>

<class name="CookieManager"

 extends="java.lang.Object"

 abstract="false"
@@ -174438,16 +173871,6 @@ 
 visibility="protected"

>

</method>

<field name="mProxy"

 type="android.webkit.CallbackProxy"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="protected"

>

</field>

<field name="mResult"

 type="boolean"

 transient="false"

api/current.xml

+0 −577

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/webkit/JsResult.java

+4 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ public class JsResult { 
    private boolean mTriedToNotifyBeforeReady;

    // This is a basic result of a confirm or prompt dialog.

    protected boolean mResult;

    // This is the caller of the prompt and is the object that is waiting.

    /**

     *  This is the caller of the prompt and is the object that is waiting.

     *  @hide

     */

    protected final CallbackProxy mProxy;

    // This is the default value of the result.

    private final boolean mDefaultValue;