summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakan Seyalioglu <hseya@google.com>2017-01-30 11:14:48 -0800
committerErik Wolsheimer <ewol@google.com>2017-02-13 23:12:28 +0000
commit7bae18232e754542f28ed45215035d5b56fc5a76 (patch)
treead260df54671398056e64412bcc720be517c19bc
parent5758a9a94c7ca1a196b3d1c51b05ec2d937f0b59 (diff)
downloadbase-7bae18232e754542f28ed45215035d5b56fc5a76.tar.gz
DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/1844170 bug: 34147053 Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b (cherry picked from commit e3286c3145d54564e783333ac2a2bb89b9ffdc49)
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 1e26c92dd764..b746acb7cf09 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -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<>();