Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev

This commit is contained in:
TreeHugger Robot
2017-02-02 20:10:48 +00:00
committed by Android (Google) Code Review

View File

@@ -1322,6 +1322,14 @@ public class ResolverActivity extends Activity {
PackageManager.MATCH_DEFAULT_ONLY
| (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0)
| (shouldGetActivityMetadata ? PackageManager.GET_META_DATA : 0));
// 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 (currentResolveList == null) {
currentResolveList = mOrigResolveList = new ArrayList<>();