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

Merge "Backport missing permission check for querying main activity intent" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2022-10-19 22:20:07 +00:00
committed by Android (Google) Code Review
parent 08a80ad4fe b319280964
commit 967cdc5544
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, void startActivityAsUser(in IApplicationThread caller, String callingPackage,
String callingFeatureId, in ComponentName component, in Rect sourceBounds, String callingFeatureId, in ComponentName component, in Rect sourceBounds,
in Bundle opts, in UserHandle user); in Bundle opts, in UserHandle user);
PendingIntent getActivityLaunchIntent(in ComponentName component, in Bundle opts, PendingIntent getActivityLaunchIntent(String callingPackage, in ComponentName component,
in UserHandle user); in Bundle opts, in UserHandle user);
void showAppDetailsAsUser(in IApplicationThread caller, String callingPackage, void showAppDetailsAsUser(in IApplicationThread caller, String callingPackage,
String callingFeatureId, in ComponentName component, in Rect sourceBounds, String callingFeatureId, in ComponentName component, in Rect sourceBounds,
in Bundle opts, in UserHandle user); in Bundle opts, in UserHandle user);

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

@@ -752,7 +752,8 @@ public class LauncherApps {
} }
try { try {
// due to b/209607104, startActivityOptions will be ignored // 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) { } catch (RemoteException re) {
throw re.rethrowFromSystemServer(); 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 @Override
public PendingIntent getActivityLaunchIntent(ComponentName component, Bundle opts, public PendingIntent getActivityLaunchIntent(String callingPackage, ComponentName component,
UserHandle user) { Bundle opts, UserHandle user) {
ensureShortcutPermission(callingPackage);
if (!canAccessProfile(user.getIdentifier(), "Cannot start activity")) { if (!canAccessProfile(user.getIdentifier(), "Cannot start activity")) {
throw new ActivityNotFoundException("Activity could not be found"); throw new ActivityNotFoundException("Activity could not be found");
} }