From e990e359f99a9e791106d4eefa046bdff8e22e6d Mon Sep 17 00:00:00 2001 From: Selim Gurun Date: Wed, 6 Mar 2013 15:30:24 -0800 Subject: Add a delimiter between scheme and host Bug: 6923539 Change-Id: Id5bbf44c90f9d0d5a468f3be3aa3e009a2ad3687 --- core/java/android/webkit/BrowserFrame.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/java/android/webkit/BrowserFrame.java') diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 24ac54fd0bfe..93dbbba8eec7 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,7 +498,8 @@ class BrowserFrame extends Handler { .getCurrentItem(); if (item != null) { WebAddress uri = new WebAddress(item.getUrl()); - String schemePlusHost = uri.getScheme() + uri.getHost(); + String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + + uri.getHost(); String[] up = mDatabase.getUsernamePassword( schemePlusHost); if (up != null && up[0] != null) { @@ -815,7 +816,7 @@ class BrowserFrame extends Handler { } WebAddress uri = new WebAddress(mCallbackProxy .getBackForwardList().getCurrentItem().getUrl()); - String schemePlusHost = uri.getScheme() + uri.getHost(); + String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + 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. -- cgit v1.2.3