summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mikhail Naganov <mnaganov@google.com> 2014-04-11 09:36:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-04-11 09:36:39 +0000
commitb429088cbb12a226fd217f04870d16bbd833ed06 (patch)
treea6b43fc1e60f82123e5dce9452f873984fd8a67a
parent26c6a50f037c6af9c41b3f96269fe194748605ce (diff)
parentd380b2098ffea60f4148be842fa41a2c0e5213d1 (diff)
Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat."
-rw-r--r--core/java/android/webkit/WebView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 81d36a4db1ff..85168fd10ed1 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1691,6 +1691,9 @@ public class WebView extends AbsoluteLayout
* thread of this WebView. Care is therefore required to maintain thread
* safety.</li>
* <li> The Java object's fields are not accessible.</li>
+ * <li> For applications targeted to API level {@link android.os.Build.VERSION_CODES#L}
+ * and above, methods of injected Java objects are enumerable from
+ * JavaScript.</li>
* </ul>
*
* @param object the Java object to inject into this WebView's JavaScript