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

Commit b070447e 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 oc-dev am: e9954e14

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e138583f75173a4d785707fa5fa4320c986a1d2
parents 21e36702 e9954e14

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

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