drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev

Browse Source
This commit is contained in:
Selim Gurun
2013-03-08 19:50:43 +00:00
committed by Android (Google) Code Review
parent b3a5c23b3a e96d6e9ca0
commit eab5a3491b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/BrowserFrame.java
View File

@ -70,7 +70,7 @@ class BrowserFrame extends Handler {
* request's LoadListener * request's LoadListener
*/ */
private final static int MAX_OUTSTANDING_REQUESTS = 300; private final static int MAX_OUTSTANDING_REQUESTS = 300;
private final static String SCHEME_HOST_DELIMITER = "://";
private final CallbackProxy mCallbackProxy; private final CallbackProxy mCallbackProxy;
private final WebSettingsClassic mSettings; private final WebSettingsClassic mSettings;
private final Context mContext; private final Context mContext;
@ -498,8 +498,7 @@ class BrowserFrame extends Handler {
.getCurrentItem(); .getCurrentItem();
if (item != null) { if (item != null) {
WebAddress uri = new WebAddress(item.getUrl()); WebAddress uri = new WebAddress(item.getUrl());
String schemePlusHost = uri.getScheme() + SCHEME_HOST_DELIMITER + String schemePlusHost = uri.getScheme() + uri.getHost();
uri.getHost();
String[] up = mDatabase.getUsernamePassword( String[] up = mDatabase.getUsernamePassword(
schemePlusHost); schemePlusHost);
if (up != null && up[0] != null) { if (up != null && up[0] != null) {
@ -816,7 +815,7 @@ class BrowserFrame extends Handler {
} }
WebAddress uri = new WebAddress(mCallbackProxy WebAddress uri = new WebAddress(mCallbackProxy
.getBackForwardList().getCurrentItem().getUrl()); .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 // Check to see if the username & password appear in
// the post data (there could be another form on the // the post data (there could be another form on the
// page and that was posted instead. // page and that was posted instead.