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

Merge changes from topic "presubmit-am-0d13c95295c446889fc51032ba336d89" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] Security fixes for PendingIntent related apis in LauncherApps 2p: e41e04bb8c
  Security fixes for PendingIntent related apis in LauncherApps
This commit is contained in:
TreeHugger Robot
2022-02-09 17:53:50 +00:00
committed by Android (Google) Code Review
parent a03eeb9665 167749b462
commit 459761c7a3
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -739,7 +739,7 @@ public class LauncherApps {
* {@link #startMainActivity(ComponentName, UserHandle, Rect, Bundle)}. * {@link #startMainActivity(ComponentName, UserHandle, Rect, Bundle)}.
* *
* @param component The ComponentName of the activity to launch * @param component The ComponentName of the activity to launch
* @param startActivityOptions Options to pass to startActivity * @param startActivityOptions This parameter is no longer supported
* @param user The UserHandle of the profile * @param user The UserHandle of the profile
* @hide * @hide
*/ */
@@ -751,7 +751,8 @@ public class LauncherApps {
Log.i(TAG, "GetMainActivityLaunchIntent " + component + " " + user); Log.i(TAG, "GetMainActivityLaunchIntent " + component + " " + user);
} }
try { try {
return mService.getActivityLaunchIntent(component, startActivityOptions, user); // due to b/209607104, startActivityOptions will be ignored
return mService.getActivityLaunchIntent(component, null /* opts */, user);
} catch (RemoteException re) { } catch (RemoteException re) {
throw re.rethrowFromSystemServer(); throw re.rethrowFromSystemServer();
} }
@@ -846,7 +847,7 @@ public class LauncherApps {
* *
* @param packageName The packageName of the shortcut * @param packageName The packageName of the shortcut
* @param shortcutId The id of the shortcut * @param shortcutId The id of the shortcut
* @param opts Options to pass to the PendingIntent * @param opts This parameter is no longer supported
* @param user The UserHandle of the profile * @param user The UserHandle of the profile
*/ */
@Nullable @Nullable
@@ -858,8 +859,9 @@ public class LauncherApps {
Log.i(TAG, "GetShortcutIntent " + packageName + "/" + shortcutId + " " + user); Log.i(TAG, "GetShortcutIntent " + packageName + "/" + shortcutId + " " + user);
} }
try { try {
// due to b/209607104, opts will be ignored
return mService.getShortcutIntent( return mService.getShortcutIntent(
mContext.getPackageName(), packageName, shortcutId, opts, user); mContext.getPackageName(), packageName, shortcutId, null /* opts */, user);
} catch (RemoteException re) { } catch (RemoteException re) {
throw re.rethrowFromSystemServer(); throw re.rethrowFromSystemServer();
} }

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

@@ -815,7 +815,7 @@ public class LauncherAppsService extends SystemService {
PendingIntent injectCreatePendingIntent(int requestCode, @NonNull Intent[] intents, PendingIntent injectCreatePendingIntent(int requestCode, @NonNull Intent[] intents,
int flags, Bundle options, String ownerPackage, int ownerUserId) { int flags, Bundle options, String ownerPackage, int ownerUserId) {
return mActivityManagerInternal.getPendingIntentActivityAsApp(requestCode, intents, return mActivityManagerInternal.getPendingIntentActivityAsApp(requestCode, intents,
flags, options, ownerPackage, ownerUserId); flags, null /* options */, ownerPackage, ownerUserId);
} }
@Override @Override
@@ -1117,7 +1117,7 @@ public class LauncherAppsService extends SystemService {
// calling identity to mirror the startActivityAsUser() call which does not validate // calling identity to mirror the startActivityAsUser() call which does not validate
// the calling user // the calling user
return PendingIntent.getActivityAsUser(mContext, 0 /* requestCode */, launchIntent, return PendingIntent.getActivityAsUser(mContext, 0 /* requestCode */, launchIntent,
FLAG_IMMUTABLE, opts, user); FLAG_IMMUTABLE, null /* options */, user);
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);
} }