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

Commit 13606f3f 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 udc-dev am: a0771817 

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



Change-Id: I3f53fcdc4d07215f5feb2630f725e9f73a97e3a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 027cb883 a0771817

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

+19 −8
Original line number Diff line number Diff line
@@ -512,24 +512,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;

    }



    /**