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

Commit c15f87c9 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Enforce sysui-held permissions when getting main launch intent" into... 

Merge "Enforce sysui-held permissions when getting main launch intent" into udc-dev am: 2d3f07bf am: ee4f18de

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



Change-Id: I518afac44354a155d2c38b6308aac214114eb1de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65b2dc33 ee4f18de

core/java/android/content/pm/LauncherApps.java

+0 −4
Original line number Diff line number Diff line
@@ -765,10 +765,6 @@ public class LauncherApps { 
    @Nullable

    public PendingIntent getMainActivityLaunchIntent(@NonNull ComponentName component,

            @Nullable Bundle startActivityOptions, @NonNull UserHandle user) {

        if (mContext.checkSelfPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS)

                != PackageManager.PERMISSION_GRANTED) {

            Log.w(TAG, "Only allowed for recents.");

        }

        logErrorForInvalidProfileAccess(user);

        if (DEBUG) {

            Log.i(TAG, "GetMainActivityLaunchIntent " + component + " " + user);

services/core/java/com/android/server/pm/LauncherAppsService.java

+5 −1
Original line number Diff line number Diff line
@@ -1330,7 +1330,11 @@ public class LauncherAppsService extends SystemService { 
        @Override

        public PendingIntent getActivityLaunchIntent(String callingPackage, ComponentName component,

                UserHandle user) {

            ensureShortcutPermission(callingPackage);

            if (mContext.checkPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS,

                    injectBinderCallingPid(), injectBinderCallingUid())

                            != PackageManager.PERMISSION_GRANTED) {

                throw new SecurityException("Permission START_TASKS_FROM_RECENTS required");

            }

            if (!canAccessProfile(user.getIdentifier(), "Cannot start activity")) {

                throw new ActivityNotFoundException("Activity could not be found");

            }