commit bc4136b79483529a2dc0459ea730ce3580db70c9
author Adam Powell <adamp@google.com> Wed Apr 29 02:24:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 02:24:23 2015 +0000
tree 69a61ccb99129b10d3b9c7eeb51e558e57d9934c
parent 33d82aeac394f9e46a008ff6597a178830bf3c94
parent 57628b6295b55c1be020e4bacc930af9c9fe6af9

am 57628b62: am 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev

* commit '57628b6295b55c1be020e4bacc930af9c9fe6af9':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets

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));
+                }
             }
         }