diff options
| author | Chris Tate <ctate@android.com> | 2020-04-07 17:52:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-07 17:52:30 +0000 |
| commit | 6da62f7e0eae31f23dae5c3449c8634ac8034ec7 (patch) | |
| tree | a8ce55ce26f172ce757cb8912e4a227ac3924b5e | |
| parent | 7461be09bd1554f461680a5468df7029513a39d4 (diff) | |
| parent | 0d01b03776f354b444b257224397a7700c4df0bb (diff) | |
| download | frameworks_base-6da62f7e0eae31f23dae5c3449c8634ac8034ec7.tar.gz frameworks_base-6da62f7e0eae31f23dae5c3449c8634ac8034ec7.tar.bz2 frameworks_base-6da62f7e0eae31f23dae5c3449c8634ac8034ec7.zip | |
Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776
Change-Id: I81ea478e735c5c3d571835a99edb1547885d76ab
| -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 2c03dcdc63b..44c5b1e9b19 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -18536,7 +18536,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( |