Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I814ad74ff1db225facaec98f7cb554bdd13a5120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2022-10-19 23:02:53 +00:00
committed by Automerger Merge Worker
parent fd27498834 985f62409b
commit 6245532cbf
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/ILauncherApps.aidl
View File

@@ -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);

3
core/java/android/content/pm/LauncherApps.java
View File

@@ -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();
}

5
services/core/java/com/android/server/pm/LauncherAppsService.java
View File

@@ -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");
}