Merge "Verify all possible hosts that match web nav" into rvc-dev

This commit is contained in:
Chris Tate
2020-04-07 17:41:28 +00:00
committed by Android (Google) Code Review

View File

@@ -17572,11 +17572,13 @@ public class PackageManagerService extends IPackageManager.Stub
}
if (needToVerify) {
final boolean needsVerification = needsNetworkVerificationLPr(packageName);
final int verificationId = mIntentFilterVerificationToken++;
for (ParsedActivity a : activities) {
for (ParsedIntentInfo filter : a.getIntents()) {
if (filter.handlesWebUris(true)
&& needsNetworkVerificationLPr(a.getPackageName())) {
// Run verification against hosts mentioned in any web-nav intent filter,
// even if the filter matches non-web schemes as well
if (needsVerification && filter.handlesWebUris(false)) {
if (DEBUG_DOMAIN_VERIFICATION) Slog.d(TAG,
"Verification needed for IntentFilter:" + filter.toString());
mIntentFilterVerifier.addOneIntentFilterVerification(