summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-04-07 23:09:22 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-04-07 23:09:22 +0000
commitfb54ea754bed0557252b0958630a45aa0e8a05d2 (patch)
tree92c918ee5a9fbdc8a16cc7f6cc471aa06be3778f
parent00444ce47d22415912c01e30cb51c11d9cc4cc5b (diff)
parent5a9674e3acdb491c15aceebb3632475caf4e7d44 (diff)
downloadframeworks_base-fb54ea754bed0557252b0958630a45aa0e8a05d2.tar.gz
frameworks_base-fb54ea754bed0557252b0958630a45aa0e8a05d2.tar.bz2
frameworks_base-fb54ea754bed0557252b0958630a45aa0e8a05d2.zip
Snap for 6373393 from 5a9674e3acdb491c15aceebb3632475caf4e7d44 to qt-qpr3-release
Change-Id: Ia890158aa38cc97f421bc6d1504c9848f2233832
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
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(