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

Merge "Ignore PendingResults when checking for mutable implicit PendingIntents" into udc-dev am: 1af488af79

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

Change-Id: I6bb727a616ca2017d6fbf29aa48f30f108ba231c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Azhara Assanova
2023-04-28 16:33:49 +00:00
committed by Automerger Merge Worker
parent f3c895e9fe 1af488af79
commit 9b8583ff1e
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/app/PendingIntent.java
View File

@@ -407,7 +407,7 @@ public final class PendingIntent implements Parcelable {
}
private static void checkPendingIntent(int flags, @NonNull Intent intent,
@NonNull Context context) {
@NonNull Context context, boolean isActivityResultType) {
final boolean isFlagImmutableSet = (flags & PendingIntent.FLAG_IMMUTABLE) != 0;
final boolean isFlagMutableSet = (flags & PendingIntent.FLAG_MUTABLE) != 0;
final String packageName = context.getPackageName();
@@ -428,11 +428,12 @@ public final class PendingIntent implements Parcelable {
throw new IllegalArgumentException(msg);
}
// For apps with target SDK < U, warn that creation or retrieval of a mutable
// implicit PendingIntent will be blocked from target SDK U onwards for security
// reasons. The block itself happens on the server side, but this warning has to
// stay here to preserve the client side stack trace for app developers.
if (isNewMutableDisallowedImplicitPendingIntent(flags, intent)
// For apps with target SDK < U, warn that creation or retrieval of a mutable implicit
// PendingIntent that is not of type {@link ActivityManager#INTENT_SENDER_ACTIVITY_RESULT}
// will be blocked from target SDK U onwards for security reasons. The block itself
// happens on the server side, but this warning has to stay here to preserve the client
// side stack trace for app developers.
if (isNewMutableDisallowedImplicitPendingIntent(flags, intent, isActivityResultType)
&& !Compatibility.isChangeEnabled(BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT)) {
String msg = "New mutable implicit PendingIntent: pkg=" + packageName
+ ", action=" + intent.getAction()
@@ -445,7 +446,13 @@ public final class PendingIntent implements Parcelable {
/** @hide */
public static boolean isNewMutableDisallowedImplicitPendingIntent(int flags,
@NonNull Intent intent) {
@NonNull Intent intent, boolean isActivityResultType) {
if (isActivityResultType) {
// Pending intents of type {@link ActivityManager#INTENT_SENDER_ACTIVITY_RESULT}
// should be ignored as they are intrinsically tied to a target which means they
// are already explicit.
return false;
}
boolean isFlagNoCreateSet = (flags & PendingIntent.FLAG_NO_CREATE) != 0;
boolean isFlagMutableSet = (flags & PendingIntent.FLAG_MUTABLE) != 0;
boolean isImplicit = (intent.getComponent() == null) && (intent.getPackage() == null);
@@ -534,7 +541,7 @@ public final class PendingIntent implements Parcelable {
@NonNull Intent intent, int flags, Bundle options, UserHandle user) {
String packageName = context.getPackageName();
String resolvedType = intent.resolveTypeIfNeeded(context.getContentResolver());
checkPendingIntent(flags, intent, context);
checkPendingIntent(flags, intent, context, /* isActivityResultType */ false);
try {
intent.migrateExtraStreamToClipData(context);
intent.prepareToLeaveProcess(context);
@@ -668,7 +675,7 @@ public final class PendingIntent implements Parcelable {
intents[i].migrateExtraStreamToClipData(context);
intents[i].prepareToLeaveProcess(context);
resolvedTypes[i] = intents[i].resolveTypeIfNeeded(context.getContentResolver());
checkPendingIntent(flags, intents[i], context);
checkPendingIntent(flags, intents[i], context, /* isActivityResultType */ false);
}
try {
IIntentSender target =
@@ -721,7 +728,7 @@ public final class PendingIntent implements Parcelable {
Intent intent, int flags, UserHandle userHandle) {
String packageName = context.getPackageName();
String resolvedType = intent.resolveTypeIfNeeded(context.getContentResolver());
checkPendingIntent(flags, intent, context);
checkPendingIntent(flags, intent, context, /* isActivityResultType */ false);
try {
intent.prepareToLeaveProcess(context);
IIntentSender target =
@@ -800,7 +807,7 @@ public final class PendingIntent implements Parcelable {
Intent intent, int flags, int serviceKind) {
String packageName = context.getPackageName();
String resolvedType = intent.resolveTypeIfNeeded(context.getContentResolver());
checkPendingIntent(flags, intent, context);
checkPendingIntent(flags, intent, context, /* isActivityResultType */ false);
try {
intent.prepareToLeaveProcess(context);
IIntentSender target =

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -5190,7 +5190,10 @@ public class ActivityManagerService extends IActivityManager.Stub
throw new IllegalArgumentException(
"Can't use FLAG_RECEIVER_BOOT_UPGRADE here");
}
if (PendingIntent.isNewMutableDisallowedImplicitPendingIntent(flags, intent)) {
boolean isActivityResultType =
type == ActivityManager.INTENT_SENDER_ACTIVITY_RESULT;
if (PendingIntent.isNewMutableDisallowedImplicitPendingIntent(flags, intent,
isActivityResultType)) {
boolean isChangeEnabled = CompatChanges.isChangeEnabled(
PendingIntent.BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT,
owningUid);