Merge "Change the app compat check for mutable implicit pending intents" into udc-dev

This commit is contained in:
Azhara Assanova
2023-05-10 09:23:18 +00:00
committed by Android (Google) Code Review

View File

@@ -5226,7 +5226,7 @@ public class ActivityManagerService extends IActivityManager.Stub
isActivityResultType)) { isActivityResultType)) {
boolean isChangeEnabled = CompatChanges.isChangeEnabled( boolean isChangeEnabled = CompatChanges.isChangeEnabled(
PendingIntent.BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT, PendingIntent.BLOCK_MUTABLE_IMPLICIT_PENDING_INTENT,
owningUid); packageName, UserHandle.of(userId));
String resolvedType = resolvedTypes == null String resolvedType = resolvedTypes == null
|| i >= resolvedTypes.length ? null : resolvedTypes[i]; || i >= resolvedTypes.length ? null : resolvedTypes[i];
ActivityManagerUtils.logUnsafeIntentEvent( ActivityManagerUtils.logUnsafeIntentEvent(