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

Commit 2b583072 authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Validate RouteListingPreference GO_TO_APP component name" into udc-dev am: 3c86862d 

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



Change-Id: I02ea05b5f9144ececbc175677b6ece007a683826
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bd2898e 3c86862d

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+13 −1
Original line number Diff line number Diff line
@@ -285,8 +285,20 @@ class MediaRouter2ServiceImpl { 
                        ? routeListingPreference.getLinkedItemComponentName()

                        : null;

        if (linkedItemLandingComponent != null) {

            int callingUid = Binder.getCallingUid();

            MediaServerUtils.enforcePackageName(

                    linkedItemLandingComponent.getPackageName(), Binder.getCallingUid());

                    linkedItemLandingComponent.getPackageName(), callingUid);

            if (!MediaServerUtils.isValidActivityComponentName(

                    mContext,

                    linkedItemLandingComponent,

                    RouteListingPreference.ACTION_TRANSFER_MEDIA,

                    Binder.getCallingUserHandle())) {

                throw new IllegalArgumentException(

                        "Unable to resolve "

                                + linkedItemLandingComponent

                                + " to a valid activity for "

                                + RouteListingPreference.ACTION_TRANSFER_MEDIA);

            }

        }



        final long token = Binder.clearCallingIdentity();

services/core/java/com/android/server/media/MediaServerUtils.java

+24 −4
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 


package com.android.server.media;



import android.annotation.NonNull;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.Process;

import android.os.UserHandle;
@@ -27,11 +31,27 @@ import android.text.TextUtils; 
import com.android.server.LocalServices;



import java.io.PrintWriter;

import java.util.List;



/** Util class for media server. */

/* package */ class MediaServerUtils {



    /**

 * Util class for media server.

     * Returns whether the provided {@link ComponentName} and {@code action} resolve to a valid

     * activity for the user defined by {@code userHandle}.

     */

class MediaServerUtils {

    public static boolean isValidActivityComponentName(

            @NonNull Context context,

            @NonNull ComponentName componentName,

            @NonNull String action,

            @NonNull UserHandle userHandle) {

        Intent intent = new Intent(action);

        intent.setComponent(componentName);

        List<ResolveInfo> resolveInfos =

                context.getPackageManager()

                        .queryIntentActivitiesAsUser(intent, /* flags= */ 0, userHandle);

        return !resolveInfos.isEmpty();

    }



    /**

     * Throws if the given {@code packageName} does not correspond to the given {@code uid}.