Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940363 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4fe0f028a09bcc7c36635834046b6cd5d88d71e9
This commit is contained in:
@@ -1210,25 +1210,6 @@ public class ResolverActivity extends Activity implements
|
|||||||
if (TextUtils.isEmpty(packageName)) {
|
if (TextUtils.isEmpty(packageName)) {
|
||||||
pm.setDefaultBrowserPackageNameAsUser(ri.activityInfo.packageName, userId);
|
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 {
|
} else {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user