diff options
| author | Chris Tate <ctate@android.com> | 2020-04-07 17:40:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 17:40:58 +0000 |
| commit | b4714abf68c578597243889373f894206f669b44 (patch) | |
| tree | d9d6c2b1fa7f9b729430fd2c2d311e0b4678d7b8 | |
| parent | 95caed2805cfc0c5e81c3a0f56460d7e5d43331b (diff) | |
| parent | 24e0f76afc3a23c4c5ab7326986ccf65eaec93e2 (diff) | |
| download | base-b4714abf68c578597243889373f894206f669b44.tar.gz | |
Merge "Verify all possible hosts that match web nav" into qt-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 26677dc52909..522e08842459 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18114,7 +18114,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( |