summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chiu <chiuwinson@google.com> 2020-12-08 00:45:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-08 00:45:54 +0000
commit5c5e30f40b8846b3dce9c2e0677e7d35dee3d62d (patch)
tree63ad2e0b4fc8d4f46832b94d1426d81e381543a7
parentdab8a319881bf83eb499d37fdadaf9ee5e92f84a (diff)
parent5e971858b8eca6ac6b629fb4d208f0baf393ed57 (diff)
Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-qpr-dev am: 5e971858b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940364 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I425a4f3881d34ca06af0383ae9ca8888f1ae6a04
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java19
1 files changed, 0 insertions, 19 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 16991b472037..1270185e1ea5 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1210,25 +1210,6 @@ public class ResolverActivity extends Activity implements
if (TextUtils.isEmpty(packageName)) {
pm.setDefaultBrowserPackageNameAsUser(ri.activityInfo.packageName, userId);
}
- } else {
- // Update Domain Verification status
- ComponentName cn = intent.getComponent();
- String packageName = cn.getPackageName();
- String dataScheme = (data != null) ? data.getScheme() : null;
-
- boolean isHttpOrHttps = (dataScheme != null) &&
- (dataScheme.equals(IntentFilter.SCHEME_HTTP) ||
- dataScheme.equals(IntentFilter.SCHEME_HTTPS));
-
- boolean isViewAction = (action != null) && action.equals(Intent.ACTION_VIEW);
- boolean hasCategoryBrowsable = (categories != null) &&
- categories.contains(Intent.CATEGORY_BROWSABLE);
-
- if (isHttpOrHttps && isViewAction && hasCategoryBrowsable) {
- pm.updateIntentVerificationStatusAsUser(packageName,
- PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS,
- userId);
- }
}
} else {
try {