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

Commit aaeef5cc authored by Patrick Scott's avatar Patrick Scott Committed by Android Git Automerger
Browse files

am a14b4890: am a50d4508: Merge change I75481cb8 into eclair-mr2 

Merge commit 'a14b4890'

* commit 'a14b4890':
  Check that the resolved activity is not in our package.
parents 613e1632 a14b4890

core/java/android/webkit/LoadListener.java

+3 −2
Original line number Diff line number Diff line
@@ -376,8 +376,9 @@ class LoadListener extends Handler implements EventHandler { 
            i.setDataAndType(Uri.parse(url()), mMimeType);

            ResolveInfo info = mContext.getPackageManager().resolveActivity(i,

                    PackageManager.MATCH_DEFAULT_ONLY);

            if (info != null) {

                // someone (other than the current activity) knows how to

            if (info != null && !mContext.getPackageName().equals(

                    info.activityInfo.packageName)) {

                // someone (other than the current app) knows how to

                // handle this mime type.

                try {

                    mContext.startActivity(i);