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

Commit 4220511d authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev

parents f50f5235 7e0ab651

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

+3 −1
Original line number Diff line number Diff line
@@ -144,7 +144,9 @@ public class ChooserListAdapter extends ResolverListAdapter { 
                    }

                }

                if (ai == null) {

                    ri = packageManager.resolveActivity(ii, PackageManager.MATCH_DEFAULT_ONLY);

                    // Because of AIDL bug, resolveActivity can't accept subclasses of Intent.

                    final Intent rii = (ii.getClass() == Intent.class) ? ii : new Intent(ii);

                    ri = packageManager.resolveActivity(rii, PackageManager.MATCH_DEFAULT_ONLY);

                    ai = ri != null ? ri.activityInfo : null;

                }

                if (ai == null) {