Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-mr1-dev (9109ce17) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -780,25 +780,6 @@ public class ResolverActivity extends Activity {
		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 {