Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc4136b7 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 57628b62: am 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a... 

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

* commit '57628b62':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets
parents 33d82aea 57628b62

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

+4 −2
Original line number Diff line number Diff line
@@ -405,10 +405,12 @@ public class ChooserActivity extends ResolverActivity { 
                int launchedFromUid, boolean filterLastUsed, ChooserTarget[] callerChooserTargets) {

            super(context, initialIntents, rList, launchedFromUid, filterLastUsed);



            if (callerChooserTargets != null) {

                for (ChooserTarget target : callerChooserTargets) {

                    mCallerTargets.add(new ChooserTargetInfo(target));

                }

            }

        }



        @Override

        public boolean showsExtendedInfo(TargetInfo info) {