diff options
| author | Chris Tate <ctate@android.com> | 2020-04-07 17:41:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-07 17:41:16 +0000 |
| commit | a78915311fac7261fa58cac519fdb1a6f5595075 (patch) | |
| tree | 92c918ee5a9fbdc8a16cc7f6cc471aa06be3778f | |
| parent | 79f352382f696e308928579dbff130f76f293016 (diff) | |
| parent | f4976307cec95e213cf0ad656dd3d34a311e55c5 (diff) | |
| download | frameworks_base-a78915311fac7261fa58cac519fdb1a6f5595075.tar.gz frameworks_base-a78915311fac7261fa58cac519fdb1a6f5595075.tar.bz2 frameworks_base-a78915311fac7261fa58cac519fdb1a6f5595075.zip | |
Merge "Verify all possible hosts that match web nav" into qt-qpr1-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 093382a632c..6bed7f381a6 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18156,7 +18156,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( |