diff options
| author | Adam Powell <adamp@google.com> | 2015-04-29 01:59:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 01:59:44 +0000 |
| commit | 57628b6295b55c1be020e4bacc930af9c9fe6af9 (patch) | |
| tree | 93d884cec47bd28aefbe504e084396fb68f75aa8 /core/java/com | |
| parent | 85b9577e4fd6c8cc3871a81364433078f7517b58 (diff) | |
| parent | 78cc38d5011df42eb8d15eef81a6bef63c5f2eaa (diff) | |
| download | frameworks_base-57628b6295b55c1be020e4bacc930af9c9fe6af9.zip frameworks_base-57628b6295b55c1be020e4bacc930af9c9fe6af9.tar.gz frameworks_base-57628b6295b55c1be020e4bacc930af9c9fe6af9.tar.bz2 | |
am 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
* commit '78cc38d5011df42eb8d15eef81a6bef63c5f2eaa':
Fix a bug when constructing a ChooserTargetAdapter without custom targets
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ public class ChooserActivity extends ResolverActivity { 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)); + } } } |