diff options
| author | Andy Stadler <> | 2009-04-10 16:24:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 16:24:47 -0700 |
| commit | f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 (patch) | |
| tree | 1dd68eeddbfa83d571a3544d6d2e25ba9be21b49 /core/java/android/webkit | |
| parent | 1eb75a0b3770177c3f0d0c2e843f80fc34451ef5 (diff) | |
| download | frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.zip frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.gz frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.bz2 | |
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebHistoryItem.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/webkit/WebHistoryItem.java b/core/java/android/webkit/WebHistoryItem.java index a408e06..fd26b98 100644 --- a/core/java/android/webkit/WebHistoryItem.java +++ b/core/java/android/webkit/WebHistoryItem.java @@ -101,8 +101,6 @@ public class WebHistoryItem implements Cloneable { * url, the final url may be different as there might have been * redirects while loading the site. * @return The original url of this history item. - * - * @hide pending API Council approval */ public String getOriginalUrl() { return mOriginalUrl; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 1822ba4..a5846ed 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -909,8 +909,6 @@ public class WebView extends AbsoluteLayout * the javascript property window.navigator.isOnline and * generates the online/offline event as specified in HTML5, sec. 5.7.7 * @param networkUp boolean indicating if network is available - * - * @hide pending API Council approval */ public void setNetworkAvailable(boolean networkUp) { mWebViewCore.sendMessage(EventHub.SET_NETWORK_STATE, @@ -1776,8 +1774,6 @@ public class WebView extends AbsoluteLayout * Also, there may have been redirects resulting in a different url to that * originally requested. * @return The url that was originally requested for the current page. - * - * @hide pending API Council approval */ public String getOriginalUrl() { WebHistoryItem h = mCallbackProxy.getBackForwardList().getCurrentItem(); |