summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2013-07-30 11:05:09 +0100
committerBen Murdoch <benm@google.com>2013-07-30 11:35:14 +0100
commit1c8c179dbfee88749101155c1cd7b430d1a8e75c (patch)
tree79c5f80adea43ecd3ba76f5a233d861f05372158
parent97d01407c7db6aeaa9dd100fc95e5b549921b777 (diff)
downloadframeworks_base-1c8c179dbfee88749101155c1cd7b430d1a8e75c.zip
frameworks_base-1c8c179dbfee88749101155c1cd7b430d1a8e75c.tar.gz
frameworks_base-1c8c179dbfee88749101155c1cd7b430d1a8e75c.tar.bz2
Unhide WebView.evaluateJavascript(..)
CTS test is now added, so we are now ready to unhide. Bug: 9814043 Change-Id: I9970b7010300b1b0644498f0359ca3840410dcea
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/webkit/WebView.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 76eda4f..2a79ba5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29521,6 +29521,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();