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

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

Merge changes from topic "presubmit-am-b521fdc3415843d792ac3226b71ecb4a" into... 

Merge changes from topic "presubmit-am-b521fdc3415843d792ac3226b71ecb4a" into sc-qpr1-dev am: 985f6240

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



Change-Id: I814ad74ff1db225facaec98f7cb554bdd13a5120
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd274988 985f6240

core/java/android/content/pm/ILauncherApps.aidl

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ interface ILauncherApps { 
    void startActivityAsUser(in IApplicationThread caller, String callingPackage,

            String callingFeatureId, in ComponentName component, in Rect sourceBounds,

            in Bundle opts, in UserHandle user);

    PendingIntent getActivityLaunchIntent(in ComponentName component, in Bundle opts,

            in UserHandle user);

    PendingIntent getActivityLaunchIntent(String callingPackage, in ComponentName component,

            in Bundle opts, in UserHandle user);

    void showAppDetailsAsUser(in IApplicationThread caller, String callingPackage,

            String callingFeatureId, in ComponentName component, in Rect sourceBounds,

            in Bundle opts, in UserHandle user);

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

+2 −1
Original line number Diff line number Diff line
@@ -752,7 +752,8 @@ public class LauncherApps { 
        }

        try {

            // due to b/209607104, startActivityOptions will be ignored

            return mService.getActivityLaunchIntent(component, null /* opts */, user);

            return mService.getActivityLaunchIntent(mContext.getPackageName(), component,

                    null /* opts */, user);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

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

+3 −2
Original line number Diff line number Diff line
@@ -1098,8 +1098,9 @@ public class LauncherAppsService extends SystemService { 
        }



        @Override

        public PendingIntent getActivityLaunchIntent(ComponentName component, Bundle opts,

                UserHandle user) {

        public PendingIntent getActivityLaunchIntent(String callingPackage, ComponentName component,

                Bundle opts, UserHandle user) {

            ensureShortcutPermission(callingPackage);

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

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

            }