diff options
| author | Chris Tate <ctate@android.com> | 2020-04-07 17:40:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 17:40:04 +0000 |
| commit | 0d01b03776f354b444b257224397a7700c4df0bb (patch) | |
| tree | 0bc6d51231418c90243d2dd5b2366f74a8a7a902 | |
| parent | 55dcec46fb6fc904b0521ed1d40df08ef5db494f (diff) | |
| parent | 18e46e36eba07a83a204cb3d16aa2b2cf4c5164d (diff) | |
| download | frameworks_base-0d01b03776f354b444b257224397a7700c4df0bb.tar.gz frameworks_base-0d01b03776f354b444b257224397a7700c4df0bb.tar.bz2 frameworks_base-0d01b03776f354b444b257224397a7700c4df0bb.zip | |
Merge "Verify all possible hosts that match web nav" into oc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index a3f3cedf1e2..3888c3130c1 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18470,7 +18470,9 @@ public class PackageManagerService extends IPackageManager.Stub final int verificationId = mIntentFilterVerificationToken++; for (PackageParser.Activity a : pkg.activities) { for (ActivityIntentInfo filter : a.intents) { - if (filter.handlesWebUris(true) && needsNetworkVerificationLPr(filter)) { + // Run verification against hosts mentioned in any web-nav intent filter, + // even if the filter matches non-web schemes as well + if (filter.handlesWebUris(false) && needsNetworkVerificationLPr(filter)) { if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG, "Verification needed for IntentFilter:" + filter.toString()); mIntentFilterVerifier.addOneIntentFilterVerification( |