Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eab5a349 authored by Selim Gurun's avatar Selim Gurun Committed by Android (Google) Code Review
Browse files

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

parents b3a5c23b e96d6e9c

core/java/android/webkit/BrowserFrame.java

+3 −4
Original line number Diff line number Diff line
@@ -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.