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

Commit eb3d11af authored by Oli Thompson's avatar Oli Thompson Committed by Automerger Merge Worker
Browse files

Merge "Check underlying intent as well as intent selector" into tm-dev am: 1439f3d7 

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



Change-Id: Ia844b106430de2c24a09035ff8fd3202648d7ff9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cbca6b5 1439f3d7

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

+19 −8
Original line number Diff line number Diff line
@@ -319,24 +319,35 @@ public class IntentForwarderActivity extends Activity { 
                Intent.FLAG_ACTIVITY_FORWARD_RESULT | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);

        sanitizeIntent(forwardIntent);



        Intent intentToCheck = forwardIntent;

        if (Intent.ACTION_CHOOSER.equals(forwardIntent.getAction())) {

        if (!canForwardInner(forwardIntent, sourceUserId, targetUserId, packageManager,

                contentResolver)) {

            return null;

        }

        if (forwardIntent.getSelector() != null) {

            intentToCheck = forwardIntent.getSelector();

            sanitizeIntent(forwardIntent.getSelector());

            if (!canForwardInner(forwardIntent.getSelector(), sourceUserId, targetUserId,

                    packageManager, contentResolver)) {

                return null;

            }

        }

        return forwardIntent;

    }



    private static boolean canForwardInner(Intent intent, int sourceUserId, int targetUserId,

            IPackageManager packageManager, ContentResolver contentResolver) {

        if (Intent.ACTION_CHOOSER.equals(intent.getAction())) {

            return false;

        }

        String resolvedType = intentToCheck.resolveTypeIfNeeded(contentResolver);

        sanitizeIntent(intentToCheck);

        String resolvedType = intent.resolveTypeIfNeeded(contentResolver);

        try {

            if (packageManager.canForwardTo(

                    intentToCheck, resolvedType, sourceUserId, targetUserId)) {

                return forwardIntent;

                    intent, resolvedType, sourceUserId, targetUserId)) {

                return true;

            }

        } catch (RemoteException e) {

            Slog.e(TAG, "PackageManagerService is dead?");

        }

        return null;

        return false;

    }



    /**