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

Commit d081f106 authored by Shimi Zhang's avatar Shimi Zhang Committed by android-build-merger
Browse files

Merge "aw: Correct doc of addJavascriptInterface()" into qt-dev

am: 62c764e2

Change-Id: Idaa6942a802f446e664ec3e2c6078258d9d2f8cc
parents 02ce7858 62c764e2
Loading
Loading
Loading
Loading
+7 −2
Original line number Original line Diff line number Diff line
@@ -1840,8 +1840,8 @@ public class WebView extends AbsoluteLayout


    /**
    /**
     * Injects the supplied Java object into this WebView. The object is
     * Injects the supplied Java object into this WebView. The object is
     * injected into the JavaScript context of the main frame, using the
     * injected into all frames of the web page, including all the iframes,
     * supplied name. This allows the Java object's methods to be
     * using the supplied name. This allows the Java object's methods to be
     * accessed from JavaScript. For applications targeted to API
     * accessed from JavaScript. For applications targeted to API
     * level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
     * level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
     * and above, only public methods that are annotated with
     * and above, only public methods that are annotated with
@@ -1880,6 +1880,11 @@ public class WebView extends AbsoluteLayout
     * thread of this WebView. Care is therefore required to maintain thread
     * thread of this WebView. Care is therefore required to maintain thread
     * safety.
     * safety.
     * </li>
     * </li>
     * <li> Because the object is exposed to all the frames, any frame could
     * obtain the object name and call methods on it. There is no way to tell the
     * calling frame's origin from the app side, so the app must not assume that
     * the caller is trustworthy unless the app can guarantee that no third party
     * content is ever loaded into the WebView even inside an iframe.</li>
     * <li> The Java object's fields are not accessible.</li>
     * <li> The Java object's fields are not accessible.</li>
     * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#LOLLIPOP}
     * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#LOLLIPOP}
     * and above, methods of injected Java objects are enumerable from
     * and above, methods of injected Java objects are enumerable from