diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-31 09:13:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-31 09:13:27 +0000 |
| commit | dabc6fc8a9ee5bdd8371c413f91347d4d65c6a10 (patch) | |
| tree | 15d2c599ef5167ddd1bd03dd585a7ed43932820b | |
| parent | a1510c9849d527021b9f14ed3d451bfa8d5f1506 (diff) | |
| parent | 1c8c179dbfee88749101155c1cd7b430d1a8e75c (diff) | |
| download | frameworks_base-dabc6fc8a9ee5bdd8371c413f91347d4d65c6a10.zip frameworks_base-dabc6fc8a9ee5bdd8371c413f91347d4d65c6a10.tar.gz frameworks_base-dabc6fc8a9ee5bdd8371c413f91347d4d65c6a10.tar.bz2 | |
Merge "Unhide WebView.evaluateJavascript(..)"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index db1d832..8daa592 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29554,6 +29554,7 @@ package android.webkit { method public android.webkit.WebBackForwardList copyBackForwardList(); method public void destroy(); method public void documentHasImages(android.os.Message); + method public void evaluateJavascript(java.lang.String, android.webkit.ValueCallback<java.lang.String>); method public static java.lang.String findAddress(java.lang.String); method public deprecated int findAll(java.lang.String); method public void findAllAsync(java.lang.String); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 4f501e7..a6e68d0 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -862,7 +862,6 @@ public class WebView extends AbsoluteLayout * @param resultCallback A callback to be invoked when the script execution * completes with the result of the execution (if any). * May be null if no notificaion of the result is required. - * @hide pending API council approval and CTS test coverage. */ public void evaluateJavascript(String script, ValueCallback<String> resultCallback) { checkThread(); |