commit 4e678ff89d17bc0dbd18517a7187ea385e5e1d53
author Adam Powell <adamp@google.com> Tue Apr 28 22:59:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 28 22:59:58 2015 +0000
tree 5818c06525a7cbfc5fc0bd551bd664a51e8a58c3
parent ca067e9703ab9fcee430d13aac28d04bdc46af2a
parent d974c7b4d150661562e341eb743986f06d150298

Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev

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

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 2b77b2c..e347faa 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -405,8 +405,10 @@
                 int launchedFromUid, boolean filterLastUsed, ChooserTarget[] callerChooserTargets) {
             super(context, initialIntents, rList, launchedFromUid, filterLastUsed);
 
-            for (ChooserTarget target : callerChooserTargets) {
-                mCallerTargets.add(new ChooserTargetInfo(target));
+            if (callerChooserTargets != null) {
+                for (ChooserTarget target : callerChooserTargets) {
+                    mCallerTargets.add(new ChooserTargetInfo(target));
+                }
             }
         }