From 4e2e36323df354a2ca83fc3cef113495d88b5823 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Fri, 5 Apr 2019 08:32:47 -0400 Subject: [PATCH] Sharesheet - Limit EXTRA_INITIAL_INTENTS to 2 Will eventually merge with suggested apps Bug: 129979509 Test: ChooserActivityTest Change-Id: I0e5f5a42155c83c77c6f6e355289218bc88033e7 --- core/java/com/android/internal/app/ChooserActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 8d7df4f4ca85a..afa6a6afe5ce1 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -212,6 +212,8 @@ public class ChooserActivity extends ResolverActivity { @VisibleForTesting public static final int LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS = 250; + private static final int MAX_EXTRA_INITIAL_INTENTS = 2; + private boolean mListViewDataChanged = false; @Retention(SOURCE) @@ -356,8 +358,9 @@ public class ChooserActivity extends ResolverActivity { Parcelable[] pa = intent.getParcelableArrayExtra(Intent.EXTRA_INITIAL_INTENTS); Intent[] initialIntents = null; if (pa != null) { - initialIntents = new Intent[pa.length]; - for (int i = 0; i < pa.length; i++) { + int count = Math.min(pa.length, MAX_EXTRA_INITIAL_INTENTS); + initialIntents = new Intent[count]; + for (int i = 0; i < count; i++) { if (!(pa[i] instanceof Intent)) { Log.w(TAG, "Initial intent #" + i + " not an Intent: " + pa[i]); finish();