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

Commit a18df134 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 

Merge commit 'd503a152' into froyo-plus-aosp

* commit 'd503a152':
  Fix for 2585858, load invalid urls.
parents 3e360000 d503a152

core/java/android/webkit/FrameLoader.java

+3 −2
Original line number Diff line number Diff line
@@ -102,8 +102,9 @@ class FrameLoader { 
                                com.android.internal.R.string.httpErrorBadUrl));

                return false;

            }

            // Make sure it is correctly URL encoded before sending the request

            if (!URLUtil.verifyURLEncoding(url)) {

            // Make sure the host part of the url is correctly

            // encoded before sending the request

            if (!URLUtil.verifyURLEncoding(mListener.host())) {

                mListener.error(EventHandler.ERROR_BAD_URL,

                        mListener.getContext().getString(

                        com.android.internal.R.string.httpErrorBadUrl));