commit a5a296e6618926b71ad61a34272bfd8fd02bc38b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 02 20:10:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 02 20:10:52 2017 +0000
tree 55574bc456d442131da1bdcbb3053bc6257af3f9
parent c01308a03c23a13cf98d5137a028cdb7298ef654
parent e3286c3145d54564e783333ac2a2bb89b9ffdc49

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

core/java/com/android/internal/app/ResolverActivity.java

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 1e26c92..b746acb 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1322,6 +1322,14 @@
                             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<>();