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

Commit 6ba62905 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666



Change-Id: Ia61c7e6c5a9fbae39e3436450c5581e73f2a49ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 442e1650 4220511d

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) {