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

Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev

Browse Source 
am: 05d64e8b72

Change-Id: I3cbf8fbdc9a54f1d47c1ab4c86eaf3f1850f468f
This commit is contained in:
Adam Powell
2017-05-26 01:28:41 +00:00
committed by android-build-merger
parent ee6f729f53 05d64e8b72
commit f7a9adec31
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/app/ResolverListController.java
View File

@@ -99,6 +99,14 @@ public class ResolverListController {
| (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0)
| (shouldGetActivityMetadata ? PackageManager.GET_META_DATA : 0)
| PackageManager.MATCH_INSTANT);
// Remove any activities that are not exported.
int totalSize = infos.size();
for (int j = totalSize - 1; j >= 0 ; j--) {
ResolveInfo info = infos.get(j);
if (info.activityInfo != null && !info.activityInfo.exported) {
infos.remove(j);
}
}
if (infos != null) {
if (resolvedComponents == null) {
resolvedComponents = new ArrayList<>();