Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Verify all possible hosts that match web nav" into rvc-dev am: 21f4dd5c7c

Browse Source 
Change-Id: Ic781f4bb1e9a81fd65b8a68b192013e0d5ac43b6
This commit is contained in:
Chris Tate
2020-04-07 17:52:04 +00:00
committed by Automerger Merge Worker
parent 7aad5fc364 21f4dd5c7c
commit b33071a3c6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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