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

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

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



Change-Id: I1ea0c55c86bf8a53c4668042fa2a8e8df22441b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 175fbe4a aec1a526

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