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

Commit 649efc68 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Add IntentFilter auto verification - part 10 

- tune Intent resolution candidates filtering: remove the undefinedList
from the results and then add it again it there is no more candidates.

See bug #19628271

Change-Id: I9ab077f6a431367be8bab30c134d34e1e7ac51ed
parent ef741da4

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

+2 −1
Original line number Diff line number Diff line
@@ -4154,7 +4154,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            }

            // If there is nothing selected, add all candidates and remove the ones that the User

            // has explicitely put into the INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER state and

            // also remove any Browser Apps ones.

            // also remove any undefined ones and Browser Apps ones.

            // If there is still none after this pass, add all undefined one and Browser Apps and

            // let the User decide with the Disambiguation dialog if there are several ones.

            if (result.size() == 0) {
@@ -4162,6 +4162,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            }

            result.removeAll(neverList);

            result.removeAll(matchAllList);

            result.removeAll(undefinedList);

            if (result.size() == 0) {

                result.addAll(undefinedList);

                if ((flags & MATCH_ALL) != 0) {