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

Commit aec1a526 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-qpr-dev

parents 9ccf7960 682df5bb

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

+3 −2
Original line number Diff line number Diff line
@@ -417,8 +417,9 @@ public class ResolverListAdapter extends BaseAdapter { 
                    if (ii == null) {

                        continue;

                    }

                    ActivityInfo ai = ii.resolveActivityInfo(

                            mPm, 0);

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

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

                    ActivityInfo ai = rii.resolveActivityInfo(mPm, 0);

                    if (ai == null) {

                        Log.w(TAG, "No activity found for " + ii);

                        continue;

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

+4 −1
Original line number Diff line number Diff line
@@ -136,12 +136,15 @@ public class ResolverListController { 
            int baseFlags) {

        List<ResolverActivity.ResolvedComponentInfo> resolvedComponents = null;

        for (int i = 0, N = intents.size(); i < N; i++) {

            final Intent intent = intents.get(i);

            Intent intent = intents.get(i);

            int flags = baseFlags;

            if (intent.isWebIntent()

                        || (intent.getFlags() & Intent.FLAG_ACTIVITY_MATCH_EXTERNAL) != 0) {

                flags |= PackageManager.MATCH_INSTANT;

            }

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

            intent = (intent.getClass() == Intent.class) ? intent : new Intent(

                    intent);

            final List<ResolveInfo> infos = mpm.queryIntentActivitiesAsUser(intent, flags,

                    userHandle);

            if (infos != null) {