summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2015-05-15 18:47:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-15 18:47:45 +0000
commitafabc217226c11bad46de4eac557f8fe2e15f708 (patch)
treec29de76c0ce378b84e424e99b8b18b1b78cdb77c /api
parent2cc4a4755fcd41900e042c75cc47879d46acecda (diff)
parent26de90aa2e2b2de10f489511038e119af331ca02 (diff)
downloadframeworks_base-afabc217226c11bad46de4eac557f8fe2e15f708.zip
frameworks_base-afabc217226c11bad46de4eac557f8fe2e15f708.tar.gz
frameworks_base-afabc217226c11bad46de4eac557f8fe2e15f708.tar.bz2
Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 9fbdfdb..3b57f18 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -39076,9 +39076,9 @@ package android.webkit {
method public boolean pageDown(boolean);
method public boolean pageUp(boolean);
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 postWebMessage(android.webkit.WebMessage, android.net.Uri);
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 ed57594..dbe0d4f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -41416,9 +41416,9 @@ package android.webkit {
method public boolean pageDown(boolean);
method public boolean pageUp(boolean);
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 postWebMessage(android.webkit.WebMessage, android.net.Uri);
method public void reload();
method public void removeJavascriptInterface(java.lang.String);
method public void requestFocusNodeHref(android.os.Message);