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

Commit 06476508 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Resolve based on the correct user's default browser" into mnc-dev

parents 6a401410 7991f781

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -4716,8 +4716,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                } else {

                    // Browser/generic handling case.  If there's a default browser, go straight

                    // to that (but only if there is no other higher-priority match).

                    final String defaultBrowserPackageName = getDefaultBrowserPackageName(

                            UserHandle.myUserId());

                    final String defaultBrowserPackageName = getDefaultBrowserPackageName(userId);

                    int maxMatchPrio = 0;

                    ResolveInfo defaultBrowserMatch = null;

                    final int numCandidates = matchAllList.size();
@@ -9929,7 +9928,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            if (packageName != null) {

                result |= updateIntentVerificationStatus(packageName,

                        PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS,

                        UserHandle.myUserId());

                        userId);

                mDefaultPermissionPolicy.grantDefaultPermissionsToDefaultBrowserLPr(

                        packageName, userId);

            }