Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '4e678ff89d17bc0dbd18517a7187ea385e5e1d53':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets
This commit is contained in:
Adam Powell
2015-04-29 01:43:47 +00:00
committed by Android Git Automerger
parent dffb90fe1b 4e678ff89d
commit 78cc38d501
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ChooserActivity.java
View File

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