diff options
| author | 2013-03-08 19:50:43 +0000 | |
|---|---|---|
| committer | 2013-03-08 19:50:44 +0000 | |
| commit | eab5a3491b16ec9dd8c010de3fce1cc9f11afb55 (patch) | |
| tree | 27e2da6ead0497942ab2603a9b72d4fcff6d389e | |
| parent | b3a5c23b3a7a55bea7ef0d2cfb15b566809c6dca (diff) | |
| parent | e96d6e9ca08f5e480e23420df95188fc953fc0dd (diff) | |
Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 93dbbba8eec7..24ac54fd0bfe 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -70,7 +70,7 @@ class BrowserFrame extends Handler { * request's LoadListener */ private final static int MAX_OUTSTANDING_REQUESTS = 300; - private final static String SCHEME_HOST_DELIMITER = "://"; + private final CallbackProxy mCallbackProxy; private final WebSettingsClassic mSettings; private final Context mContext; @@ -498,8 +498,7 @@ class BrowserFrame extends Handler { .getCurrentItem(); if (item != null) { WebAddress uri = new WebAddress(item.getUrl()); - String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + - uri.getHost(); + String schemePlusHost = uri.getScheme() + uri.getHost(); String[] up = mDatabase.getUsernamePassword( schemePlusHost); if (up != null && up[0] != null) { @@ -816,7 +815,7 @@ class BrowserFrame extends Handler { } WebAddress uri = new WebAddress(mCallbackProxy .getBackForwardList().getCurrentItem().getUrl()); - String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + uri.getHost(); + String schemePlusHost = uri.getScheme() + uri.getHost(); // Check to see if the username & password appear in // the post data (there could be another form on the // page and that was posted instead. |