Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add IntentFilter auto verification - part 10" into mnc-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2015-05-13 23:20:46 +00:00
committed by Android (Google) Code Review
parent 907d8afd6b 649efc68cb
commit fe112e7b38
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4161,7 +4161,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) {
@@ -4169,6 +4169,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) {