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

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

Browse Source
This commit is contained in:
Adam Powell
2015-04-28 22:59:57 +00:00
committed by Android (Google) Code Review
parent ca067e9703 d974c7b4d1
commit 4e678ff89d
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));
}
}
}