diff options
| author | Tobias Sargeant <tobiasjs@google.com> | 2015-05-13 15:18:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 15:18:49 +0000 |
| commit | a58fbec633bb6b4fa1afe03fc25d5e81235202e1 (patch) | |
| tree | cce46f55a9d27801485a4ad8007e163382a1a310 | |
| parent | 1c5a55e997371e50deb543c0e491bdcc96e71b67 (diff) | |
| parent | 1bff3246bf7aef015ceea97f1a873f8cf6e8822a (diff) | |
| download | frameworks_base-a58fbec633bb6b4fa1afe03fc25d5e81235202e1.zip frameworks_base-a58fbec633bb6b4fa1afe03fc25d5e81235202e1.tar.gz frameworks_base-a58fbec633bb6b4fa1afe03fc25d5e81235202e1.tar.bz2 | |
Merge "Update API." into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 3ea8b67..ff3bde5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39079,7 +39079,6 @@ package android.webkit { method public void goBack(); method public void goBackOrForward(int); method public void goForward(); - method public void insertVisualStateCallback(long, android.webkit.WebView.VisualStateCallback); method public void invokeZoomPicker(); method public boolean isPrivateBrowsingEnabled(); method public void loadData(java.lang.String, java.lang.String, java.lang.String); @@ -39098,6 +39097,7 @@ package android.webkit { method public void pauseTimers(); method public void postMessageToMainFrame(android.webkit.WebMessage, android.net.Uri); method public void postUrl(java.lang.String, byte[]); + method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback); method public void reload(); method public void removeJavascriptInterface(java.lang.String); method public void requestFocusNodeHref(android.os.Message); diff --git a/api/system-current.txt b/api/system-current.txt index 616d2e7..4af1880 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41383,7 +41383,6 @@ package android.webkit { method public void goBack(); method public void goBackOrForward(int); method public void goForward(); - method public void insertVisualStateCallback(long, android.webkit.WebView.VisualStateCallback); method public void invokeZoomPicker(); method public boolean isPrivateBrowsingEnabled(); method public void loadData(java.lang.String, java.lang.String, java.lang.String); @@ -41402,6 +41401,7 @@ package android.webkit { method public void pauseTimers(); method public void postMessageToMainFrame(android.webkit.WebMessage, android.net.Uri); method public void postUrl(java.lang.String, byte[]); + method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback); method public void reload(); method public void removeJavascriptInterface(java.lang.String); method public void requestFocusNodeHref(android.os.Message); |