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

Commit 29c0a823 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am a9fa3c24: am b3ed2b8b: am ec0ed98d: am b6b97e90: am 06476508: Merge... 

am a9fa3c24: am b3ed2b8b: am ec0ed98d: am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev

* commit 'a9fa3c24':
  Resolve based on the correct user's default browser
parents 8542fc6f a9fa3c24

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

+2 −3
Original line number Diff line number Diff line
@@ -4714,8 +4714,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();
@@ -9927,7 +9926,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);

            }