Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 529a1570 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into... 

Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940363

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied4ce271ffc5b488fa08bf2af9256941e044fb09
parents c67d4ea4 ca2d8ec7

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

+0 −19
Original line number Diff line number Diff line
@@ -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 {