diff options
| author | Chris Tate <ctate@android.com> | 2020-04-07 17:40:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 17:40:48 +0000 |
| commit | 4629c18c2b029de54595ea0986458e4d73bce06a (patch) | |
| tree | 184b09a9fdc893b8c08a5d552a7dad50a43ae237 | |
| parent | f889ff2ff6eea4345b03e55c5d4298f8da8ccfd9 (diff) | |
| parent | bfa779601082d9021ea4e7d4cca571575bd0b13b (diff) | |
| download | frameworks_base-4629c18c2b029de54595ea0986458e4d73bce06a.tar.gz frameworks_base-4629c18c2b029de54595ea0986458e4d73bce06a.tar.bz2 frameworks_base-4629c18c2b029de54595ea0986458e4d73bce06a.zip | |
Merge "Verify all possible hosts that match web nav" into pi-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 1a08668b1fa..8d43959fb2c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -17759,7 +17759,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( |