diff options
| author | Selim Gurun <sgurun@google.com> | 2012-09-12 12:48:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 12:48:32 -0700 |
| commit | 4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6 (patch) | |
| tree | f56bcdf3e87fc143cc9b488fd4f43dd5b5fd2cf9 /api | |
| parent | 743115ffcd5f7b04d8b485bbfc5440216c3aaf4f (diff) | |
| parent | e91d5bee241f30513b82263bc71b56abfde8ad8d (diff) | |
| download | frameworks_base-4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6.zip frameworks_base-4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6.tar.gz frameworks_base-4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6.tar.bz2 | |
Merge "Make JavascriptInterface annotation public." into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1326307..9c127b7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26943,6 +26943,9 @@ package android.webkit { method public boolean useHttpAuthUsernamePassword(); } + public abstract class JavascriptInterface implements java.lang.annotation.Annotation { + } + public class JsPromptResult extends android.webkit.JsResult { method public void confirm(java.lang.String); } |