diff options
author | Chris Tate <ctate@android.com> | 2020-04-07 17:40:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 17:40:31 +0000 |
commit | 097d107125d6cff21a6d69d097e63f2c11f999e8 (patch) | |
tree | fe9b1eeb387ee4c228cb771512fbfd35b0734751 | |
parent | bbd74617acfcc193995d4a06a09bfab2c0acb30a (diff) | |
parent | a481c86cd3742c7792f8607c004e0eeb4016b894 (diff) | |
download | base-097d107125d6cff21a6d69d097e63f2c11f999e8.tar.gz |
Merge "Verify all possible hosts that match web nav" into oc-mr1-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 db3b7677f426..c8175befe179 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -19094,7 +19094,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( |